diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index d21758941082..dc6694db790b 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,2 +1,3 @@
 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
+DIST ansible-1.9.2.tar.gz 927525 SHA256 c25ef4738b08fdfb3094247c012f3fd1b29972acbd37f988070b2a85f5fbee00 SHA512 6c0b3eaac11e11bf90f5b63c54da86df0cb33b0ee98c987c48a68fa643b39e9f0817884767f2bd9c0f6e8852d37fd1b197d5299abc574fccc181fbb22985d4ad WHIRLPOOL 19d50845b9920d85c5ce0380303144e7a4237e673dd4beb5ff020042d7bac59dc0706cff88f08155029ce1a3aa9decc3c54261f9f16524b6e5e3b42e599d3a6b
diff --git a/app-admin/ansible/ansible-1.9.2.ebuild b/app-admin/ansible/ansible-1.9.2.ebuild
new file mode 100644
index 000000000000..f7434120988f
--- /dev/null
+++ b/app-admin/ansible/ansible-1.9.2.ebuild
@@ -0,0 +1,63 @@
+# 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.2.ebuild,v 1.1 2015/06/26 12:31:49 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils 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"
+IUSE="test"
+
+RDEPEND="
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/keyczar[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	EXAMPLES=( examples )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+
+	newenvd "${FILESDIR}"/${PN}.env 95ansible
+}
+
+src_install() {
+	distutils-r1_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	optfeature "Alternative ssh transport" dev-python/paramiko
+}
diff --git a/app-backup/deja-dup/deja-dup-32.0-r1.ebuild b/app-backup/deja-dup/deja-dup-32.0-r1.ebuild
index 4e8f6588c314..461feafebf99 100644
--- a/app-backup/deja-dup/deja-dup-32.0-r1.ebuild
+++ b/app-backup/deja-dup/deja-dup-32.0-r1.ebuild
@@ -1,12 +1,12 @@
-# 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-backup/deja-dup/deja-dup-32.0-r1.ebuild,v 1.3 2014/11/25 08:44:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/deja-dup-32.0-r1.ebuild,v 1.4 2015/06/27 16:53:54 tetromino Exp $
 
 EAPI=5
 
 GNOME2_LA_PUNT="yes"
 
-VALA_MIN_API_VERSION="0.20"
+VALA_MIN_API_VERSION="0.22" # for >=gtk+-3.10
 VALA_MAX_API_VERSION="0.24"
 
 inherit cmake-utils eutils gnome2 vala
@@ -26,7 +26,7 @@ COMMON_DEPEND="
 	app-crypt/libsecret[vala]
 	>=dev-libs/glib-2.34:2
 	>=dev-libs/libpeas-1.0
-	>=x11-libs/gtk+-3.6:3
+	>=x11-libs/gtk+-3.10:3
 	>=x11-libs/libnotify-0.7
 
 	>=app-backup/duplicity-0.6.23
@@ -59,6 +59,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DVALA_EXECUTABLE="${VALAC}"
 		-DENABLE_CCPANEL=OFF
 		-DENABLE_UNITY=OFF
 		-DENABLE_UNITY_CCPANEL=OFF
diff --git a/app-backup/deja-dup/deja-dup-34.0.ebuild b/app-backup/deja-dup/deja-dup-34.0.ebuild
index 73e8cae244dc..623fd9851034 100644
--- a/app-backup/deja-dup/deja-dup-34.0.ebuild
+++ b/app-backup/deja-dup/deja-dup-34.0.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/deja-dup-34.0.ebuild,v 1.1 2015/04/13 07:07:13 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/deja-dup/deja-dup-34.0.ebuild,v 1.4 2015/06/27 17:00:47 pacho Exp $
 
 EAPI=5
 
 GNOME2_LA_PUNT="yes"
 
-VALA_MIN_API_VERSION="0.20"
-VALA_MAX_API_VERSION="0.24"
+VALA_MIN_API_VERSION="0.22" # for >=gtk+-3.10
 
 inherit cmake-utils eutils gnome2 vala
 
@@ -26,7 +25,7 @@ COMMON_DEPEND="
 	app-crypt/libsecret[vala]
 	>=dev-libs/glib-2.34:2
 	>=dev-libs/libpeas-1.0
-	>=x11-libs/gtk+-3.6:3
+	>=x11-libs/gtk+-3.10:3
 	>=x11-libs/libnotify-0.7
 
 	>=app-backup/duplicity-0.6.23
@@ -55,6 +54,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DVALA_EXECUTABLE="${VALAC}"
 		-DENABLE_CCPANEL=OFF
 		-DENABLE_UNITY=OFF
 		-DENABLE_UNITY_CCPANEL=OFF
diff --git a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild
index 58911a0cca4c..919cca6b2aa3 100644
--- a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-1.3.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-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild,v 1.3 2015/06/21 10:42:48 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/rdiff-backup/rdiff-backup-1.3.3-r1.ebuild,v 1.4 2015/06/26 10:08:07 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -13,7 +13,7 @@ SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~mips ~ppc ppc64 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 arm ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples"
 
 DEPEND="
diff --git a/app-cdr/bashburn/Manifest b/app-cdr/bashburn/Manifest
index 440d993cb723..08d28adc0d8c 100644
--- a/app-cdr/bashburn/Manifest
+++ b/app-cdr/bashburn/Manifest
@@ -1,2 +1 @@
-DIST BashBurn-3.0.1.tar.gz 84435 SHA256 7df8630f7124d94eafe788a65024890ebdb558f80ca6cdf8ec64664fbb64cfe8 SHA512 b87e68570645aac9b78aafd2cb60e38509ba3b303e39cfa2458f89a5105a9a49c8e7a95013148568409333a692a06ff3236c47d060efcaa0a51cd96c43c42927 WHIRLPOOL dd94264394a5abf43d8ca019a7855376f1962599808abacb84c8fd04da3867bbae7574fa3d6e658f5bfc571ef61c30153b3ce62df2d40416363701e20931fb29
 DIST BashBurn-3.1.0.tar.gz 91295 SHA256 b78d5de1ee1b6e19aeee5b2f37a12aa6d02c665fd7645cad626ae7267351bb3c SHA512 9bded7a67b762be89993a6a7564d6a32f4cac209f9d16a4a861a5a36db92eda6436c2b80b89d57c051bbdafb0549999e54ce6e26477f664481cf60092eef90e5 WHIRLPOOL f21a3ea005c129f1df0bcda6d1a323934c2648620516d491539bbe17b99b8c97f5cd339fbc903a74450ba207941f7d3c3d0bde255eba0cffeb82df3c7665c9b6
diff --git a/app-cdr/bashburn/bashburn-3.0.1.ebuild b/app-cdr/bashburn/bashburn-3.0.1.ebuild
deleted file mode 100644
index b809d59aa7ac..000000000000
--- a/app-cdr/bashburn/bashburn-3.0.1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/bashburn/bashburn-3.0.1.ebuild,v 1.5 2010/10/14 19:17:55 ranger Exp $
-
-EAPI=2
-MY_P=BashBurn-${PV}
-MY_PV="3.0"
-
-DESCRIPTION="cd burning shell script"
-HOMEPAGE="http://bashburn.sourceforge.net"
-SRC_URI="http://bashburn.dose.se/index.php?s=file_download&id=3
-			-> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 sparc x86"
-IUSE="dvdr"
-
-RDEPEND="virtual/cdrtools
-	app-cdr/cdrdao
-	dvdr? ( app-cdr/dvd+rw-tools )
-	media-sound/mpg123
-	media-sound/lame
-	media-sound/vorbis-tools
-	media-sound/normalize
-	media-libs/flac
-	virtual/eject
-	app-shells/bash"
-
-S="${WORKDIR}"/${MY_PV}
-
-src_install() {
-	sed -i "s%@@BBROOTDIR@@%/opt/BashBurn%" BashBurn.sh \
-		|| die "sed failed"
-
-	dodir /opt/BashBurn
-	dodir /usr/bin
-
-	mv {burning,config,convert,func,menus,misc,lang} "${D}"/opt/BashBurn
-
-	exeinto /opt/BashBurn
-	doexe BashBurn.sh || die
-
-	ln -sf /opt/BashBurn/BashBurn.sh "${D}"/usr/bin/bashburn
-
-	pushd docs
-	dodoc ChangeLog CREDITS FAQ HOWTO INSTALL README TODO TRANSLATION_RULE
-	popd
-
-	pushd bashburn_man
-	make bashburn.1
-	doman bashburn.1
-	popd
-}
-
-pkg_postinst() {
-	einfo "BashBurn-3.0 now stores its settings exclusively in ~/.bashburnrc"
-	einfo "Any old settings in /etc/bashburn/bashburnrc will be ignored"
-}
diff --git a/app-cdr/burn-cd/burn-cd-1.8.0.ebuild b/app-cdr/burn-cd/burn-cd-1.8.0.ebuild
deleted file mode 100644
index b9daa7bd66bc..000000000000
--- a/app-cdr/burn-cd/burn-cd-1.8.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/burn-cd/burn-cd-1.8.0.ebuild,v 1.1 2009/11/24 14:55:12 beandog Exp $
-
-DESCRIPTION="Smart console frontend for virtual/cdrtools and dvd+rw-tools"
-HOMEPAGE="http://burn-cd.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/python
-	virtual/cdrtools
-	app-cdr/dvd+rw-tools"
-DEPEND=""
-
-src_install() {
-	newbin ${P} ${PN} || die "newbin failed."
-}
diff --git a/app-cdr/cdcover/cdcover-0.7.4.ebuild b/app-cdr/cdcover/cdcover-0.7.4.ebuild
deleted file mode 100644
index d3e2008cad62..000000000000
--- a/app-cdr/cdcover/cdcover-0.7.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdcover/cdcover-0.7.4.ebuild,v 1.1 2011/02/11 19:58:58 ssuominen Exp $
-
-EAPI=2
-
-PYTHON_DEPEND=2
-PYTHON_USE_WITH=tk
-
-inherit eutils python
-
-DESCRIPTION="cdcover allows the creation of inlay-sheets for jewel cd-cases"
-HOMEPAGE="http://cdcover.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cddb"
-
-RDEPEND="cddb? ( dev-python/cddb-py )
-	media-sound/cd-discid"
-DEPEND=""
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-	sed -i -e 's:ggv:gv:' dotcdcover.{example,m4} || die
-}
-
-src_compile() {
-	emake prefix="${D}"/usr target=/usr || die
-}
-
-src_install() {
-	emake prefix="${D}"/usr docdir="${D}"/usr/share/doc/${PF} install || die
-
-	python_convert_shebangs -r 2 "${D}"
-
-	make_desktop_entry ${PN} ${PN}
-
-	insinto /usr/share/doc/${PF}/pdf
-	doins doc/cdcover.pdf
-
-	prepalldocs
-}
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1.ebuild
deleted file mode 100644
index 2e1015e33e70..000000000000
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1.ebuild,v 1.12 2008/10/27 05:42:13 vapier Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A set of tools for DVD+RW/-RW drives"
-HOMEPAGE="http://fy.chalmers.se/~appro/linux/DVD+RW/"
-SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE=""
-
-RDEPEND="virtual/cdrtools"
-DEPEND="${RDEPEND}
-	sys-devel/m4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# Linux compiler flags only include -O2 and are incremental
-	sed -i '/FLAGS/s:-O2::' Makefile.m4
-}
-
-src_compile() {
-	emake SHELL=/bin/bash CC=$(tc-getCC) CXX=$(tc-getCXX) || die
-}
-
-src_install() {
-	emake SHELL=/bin/bash prefix="${D}/usr" install || die
-	dohtml index.html
-}
-
-pkg_postinst() {
-	elog "When you run growisofs if you receive:"
-	elog "unable to anonymously mmap 33554432: Resource temporarily unavailable"
-	elog "error message please run 'ulimit -l unlimited'"
-}
diff --git a/app-cdr/gtkcdlabel/gtkcdlabel-1.14.ebuild b/app-cdr/gtkcdlabel/gtkcdlabel-1.14.ebuild
deleted file mode 100644
index b3e0ffa8df16..000000000000
--- a/app-cdr/gtkcdlabel/gtkcdlabel-1.14.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtkcdlabel/gtkcdlabel-1.14.ebuild,v 1.4 2014/08/10 02:14:16 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-
-inherit python
-
-DESCRIPTION="a GUI frontend to cdlabelgen which is a program that can generate a variety of CD tray covers"
-HOMEPAGE="http://gtkcdlabel.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=app-cdr/cdlabelgen-4
-	dev-python/pygtk"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-}
-
-src_install() {
-	dobin usr/bin/${PN}.py || die "dobin failed"
-	insinto /usr/share
-	doins -r usr/share/{applications,${PN},pixmaps} || die "doins failed"
-	dodoc usr/share/doc/${PN}/{AUTHORS,README}
-}
diff --git a/app-cdr/iat/Manifest b/app-cdr/iat/Manifest
index 1cc0f8227f8f..75f86e3a316e 100644
--- a/app-cdr/iat/Manifest
+++ b/app-cdr/iat/Manifest
@@ -1,2 +1 @@
-DIST iat-0.1.3-src.tar.bz2 87028 SHA256 60a81ba07ba0dfa40e49158c8cc58aafd7f12d82c6e1323e19d8277ae250b8eb SHA512 da65f5269c4656e2da77f6b85baea01fe45984b2d222494c8aeab43bd032f140d2efbec1d929333f47a3d78af716cc9de55e312b50d2381074ab276c90790e22 WHIRLPOOL 50d3799493e58f168cd6395a4ff8ecb50350726db8ddd59c9a02b2803ed4f1bcecc16f69145fd0c7d8b4450ca7c745a7bd6b7917d23d8a4b3d8b9c4d062f5a8c
 DIST iat-0.1.7.tar.bz2 103750 SHA256 fb72c42f4be18107ec1bff8448bd6fac2a3926a574d4950a4d5120f0012d62ca SHA512 ecde86ae11a9d88f7fa05c3b803941f6e5fad6f3dd14dc094145aa809fe9a15f7b410dae7b81715147c92309b618b8b62975ee193b73f38250b4403a6dd55eb4 WHIRLPOOL 879dfcb836a08bcd75874ea34e90c2c567ed88e696953edbb0154c90781f8a16ebca111585049862efa00dd571a4098acd8c9a5b925b06b9f78ae066509a3230
diff --git a/app-cdr/iat/iat-0.1.3.ebuild b/app-cdr/iat/iat-0.1.3.ebuild
deleted file mode 100644
index bbab382157bb..000000000000
--- a/app-cdr/iat/iat-0.1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/iat/iat-0.1.3.ebuild,v 1.2 2008/09/17 08:31:20 armin76 Exp $
-
-DESCRIPTION="BIN, MDF, PDI, CDI, NRG, and B5I converters"
-HOMEPAGE="http://iat.berlios.de"
-SRC_URI="mirror://berlios/iat/${P}-src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	econf --disable-dependency-tracking
-	emake || die "emake failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS
-}
diff --git a/app-cdr/qpxtool/Manifest b/app-cdr/qpxtool/Manifest
index 91d543e20220..e3c9fc7f7e26 100644
--- a/app-cdr/qpxtool/Manifest
+++ b/app-cdr/qpxtool/Manifest
@@ -1,2 +1 @@
-DIST qpxtool-0.7.0.tar.bz2 482918 SHA256 e5abf00c032e14a5b0cbc2359b4bc69833faf9c976273809904a0644ec5dfdbd SHA512 0c905eba9b43be205de3ff2b6c0bfa3b1a0ac01a1dd0926827a8655854ef59116c64ec58d904342a02f50592d3bbd50d51f3f1cc9870a39736eea8b1cca0d46c WHIRLPOOL c5c1e01cb4df4167d8348c363ac4a455ea8e1ae91d72af2f616b9c6db8a7fe2e2b1596ee1e7cf6dd6ced4a0d54fa35a457e4af894cd781a1d8af36fb92d22175
 DIST qpxtool-0.7.2.tar.bz2 587694 SHA256 ac18e4a1b4cb616c0218d04ab5a7b02f53c84449d1d0f63aa3f712656992c526 SHA512 e9384583ebdbcf450ef4fc637d9d99ac6598a5217caecb7c46e2f844e25f8808806eb31f08530a7d89f8b31247141413c306529780dbb71d992140de34a8877c WHIRLPOOL 7e44290209276f80d042e975fa57d4ec392d9dfb46e0fafe8f53cc1da2ea82d368e6b2a0f267a93a87dc8e3d3defd71c066d1a30eeb694009acef561c12f9863
diff --git a/app-cdr/qpxtool/files/qpxtool-0.7.0-ldlibs.patch b/app-cdr/qpxtool/files/qpxtool-0.7.0-ldlibs.patch
deleted file mode 100644
index 3f7b35b43879..000000000000
--- a/app-cdr/qpxtool/files/qpxtool-0.7.0-ldlibs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- qpxtool-0.7.0.old/console/f1tattoo/Makefile	2010-01-09 12:05:18.000000000 +0100
-+++ qpxtool-0.7.0/console/f1tattoo/Makefile	2010-01-09 12:21:39.000000000 +0100
-@@ -5,7 +5,7 @@
- 
- CXXFLAGS += -I. -I../../lib/include $(LPNG_INC)
- CFLAGS   += -I. -I../../lib/include $(LPNG_INC)
--LDLIBS   += -lqpxtransport -lqpxyamaha $(LPNG_LIB) -L../../lib/lib
-+LDLIBS   += -lqpxtransport -lqpxyamaha -L../../lib/lib $(LPNG_LIB)
- 
- $(BIN): $(OBJS)
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LDLIBS)
---- qpxtool-0.7.0/console/qscan/Makefile.orig	2010-01-23 19:37:37.201487022 +0100
-+++ qpxtool-0.7.0/console/qscan/Makefile	2010-01-23 19:44:07.915487435 +0100
-@@ -5,7 +5,7 @@
- 
- CXXFLAGS += -I. -I../../lib/include
- CFLAGS   += -I. -I../../lib/include
--LDLIBS   += -lqpxtransport -lqpxscan -lqpxplextor -L../../lib/lib $(LIBS_DL)
-+LDLIBS   += -lqpxtransport -lqpxscan -lqpxplextor -L../../lib/lib
- 
- $(BIN): $(OBJS)
- 	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LDLIBS)
---- qpxtool-0.7.0/lib/qpxscan/Makefile.orig	2010-01-25 18:27:39.373641192 +0100
-+++ qpxtool-0.7.0/lib/qpxscan/Makefile	2010-01-25 18:18:03.420641552 +0100
-@@ -12,6 +12,6 @@
- VER_MINOR  = 7
- VER_MICRO  = 0
- 
--LDLIBS += -lqpxtransport -lqpxplextor -L../lib $(LIBS_INET)
-+LDLIBS += $(LIBS_DL) -lqpxtransport -lqpxplextor -L../lib $(LIBS_INET)
- 
- include ../Makefile.lib
diff --git a/app-cdr/qpxtool/files/qpxtool-0.7.0-lrelease.patch b/app-cdr/qpxtool/files/qpxtool-0.7.0-lrelease.patch
deleted file mode 100644
index 3b1ad59e75f6..000000000000
--- a/app-cdr/qpxtool/files/qpxtool-0.7.0-lrelease.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.orig	2009-12-27 01:19:50.000000000 +0200
-+++ configure	2009-12-27 01:21:12.000000000 +0200
-@@ -396,9 +396,9 @@
- 
- 
- if test "$OSL" = "mingw32" ; then
--	echo "	\$(QTDIR)/../bin/lrelease -verbose qpxtool.pro" >> $mf
-+	echo "	lrelease -verbose qpxtool.pro" >> $mf
- else
--	echo "	/\$(QTDIR)/../bin/lrelease -verbose qpxtool.pro" >> $mf
-+	echo "	lrelease -verbose qpxtool.pro" >> $mf
- fi
- 	
- 	echo "
diff --git a/app-cdr/qpxtool/qpxtool-0.7.0-r1.ebuild b/app-cdr/qpxtool/qpxtool-0.7.0-r1.ebuild
deleted file mode 100644
index d7cb1465bdab..000000000000
--- a/app-cdr/qpxtool/qpxtool-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/qpxtool/qpxtool-0.7.0-r1.ebuild,v 1.4 2014/01/31 19:31:47 polynomial-c Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs qt4-r2
-
-DESCRIPTION="CD/DVD quality checking utilities"
-HOMEPAGE="http://qpxtool.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtgui:4
-	media-libs/libpng"
-
-DOCS="AUTHORS ChangeLog README ReleaseNotes TODO"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-lrelease.patch
-	epatch "${FILESDIR}"/${P}-ldlibs.patch
-	epatch "${FILESDIR}"/${P}-locale-install-race.patch
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-}
-
-src_configure() {
-	tc-export CXX
-	./configure --prefix=/usr || die
-	cd gui
-	mv -vf Makefile Makefile.orig || die "Backup Makefile for install"
-	qt4-r2_src_configure
-}
-
-src_install() {
-	mv -vf gui/Makefile.orig gui/Makefile || die "Restore Makefile for install"
-	dodir /usr/bin
-	dohtml status.html
-	qt4-r2_src_install
-}
diff --git a/app-cdr/uif2iso/Manifest b/app-cdr/uif2iso/Manifest
index 3488cac75f64..32fa02655c7e 100644
--- a/app-cdr/uif2iso/Manifest
+++ b/app-cdr/uif2iso/Manifest
@@ -1,2 +1 @@
-DIST uif2iso-0.1.4.zip 90006 SHA256 8d705ed43645349475a46cfd83019381a93a80ec9c6d9e08b56ab02f5fa6f010 SHA512 3ffbb8878df1fa087c20e1b1ede909b3643a651f8e307efa849c826dc7798b9ffd3375f690fdb188c42113f5defc09ac6cdd905c73d7a87a3d3f81b56311b100 WHIRLPOOL 8cb3e68409307c802654153d8702155a677f9600e0d1f1bc3dde0491573cd8e74db985b5d0ab3a75754898d6c58babc9a22a6344a8e6a87175d36bd765e16425
 DIST uif2iso-0.1.7c.zip 113727 SHA256 b78dde3e8bc28559f73e2feb46d41c8f57b511ddbe25d63ada704ef8697528ec SHA512 22e2e2d156cae7f2f72ba5959bf3b4282609397d148e6a98666382003ce568e185a90e6af8821829d302c1efea1ca2c6d155df0181c6a29294d70de8adc9591f WHIRLPOOL df4a0446faec70dcb30316a576d49cdf074b042e99a85ccb4dbd0273bc72a5b5a5e37d74c5326728fb80bd34da8783c5dd070c97c9476ff0a1c245b2d5520d56
diff --git a/app-cdr/uif2iso/uif2iso-0.1.4.ebuild b/app-cdr/uif2iso/uif2iso-0.1.4.ebuild
deleted file mode 100644
index 7fadd4f6d96d..000000000000
--- a/app-cdr/uif2iso/uif2iso-0.1.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/uif2iso/uif2iso-0.1.4.ebuild,v 1.3 2008/12/03 22:22:06 maekke Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Converts MagicISO CD-images to iso"
-HOMEPAGE="http://aluigi.org/mytoolz.htm#uif2iso"
-SRC_URI="mirror://gentoo/${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-libs/openssl
-	sys-libs/zlib"
-DEPENED="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/src"
-
-src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} ${PN}.c -lz -lcrypto || die "failed to compile"
-}
-
-src_install() {
-	dobin ${PN} || die "failed to install"
-
-	dodoc "${WORKDIR}"/${PN}.txt
-}
diff --git a/app-crypt/aespipe/aespipe-2.4c.ebuild b/app-crypt/aespipe/aespipe-2.4c.ebuild
deleted file mode 100644
index 9ba711196c67..000000000000
--- a/app-crypt/aespipe/aespipe-2.4c.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/aespipe/aespipe-2.4c.ebuild,v 1.1 2012/12/14 21:59:41 alonbl Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="Encrypts data from stdin to stdout"
-HOMEPAGE="http://loop-aes.sourceforge.net"
-SRC_URI="http://loop-aes.sourceforge.net/aespipe/${PN}-v${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE="static"
-DEPEND=""
-RDEPEND="app-arch/sharutils"
-
-S="${WORKDIR}/${PN}-v${PV}"
-
-src_compile() {
-	use static && append-ldflags -static
-	econf || die
-	emake || die
-}
-
-src_install() {
-	dobin aespipe bz2aespipe
-	dodoc README
-	doman aespipe.1
-}
diff --git a/app-crypt/gnupg-pkcs11-scd/Manifest b/app-crypt/gnupg-pkcs11-scd/Manifest
index a7fbfd144488..f6430552e1a1 100644
--- a/app-crypt/gnupg-pkcs11-scd/Manifest
+++ b/app-crypt/gnupg-pkcs11-scd/Manifest
@@ -1,2 +1 @@
-DIST gnupg-pkcs11-scd-0.7.2.tar.bz2 121139 SHA256 4cf239179e973ff621ab0ee305d58a4e7469a1cc76437245f356a3efaa882dc8 SHA512 f6e2cf045d830facd63d8d6d2496d430a23af992ffd1b1ca899a6b7d18769fdd5c6e6c9dd1bf3bad4042fc8ed8516dbf840482846549202f6460845e2ca4e9a9 WHIRLPOOL ff003a6d424d5dc23a13e06d0c2a7bff6c5d36ea45a762e53feecfe8af30abd362f294f0f04fa3196e5e4401f8aa75d5a3711161fb6cc86db5d8cb6df265d10a
 DIST gnupg-pkcs11-scd-0.7.3.tar.bz2 121593 SHA256 2406f05d996a56d0d53bf66a56fe155790037a63e919053b218ba17e2e7c860a SHA512 b87622394565b5adb2d3a8b10a7fd79820b1bd56c54263f18e151ac07ae79cd836ea3d010fdc47813bf7e1a4e4659a37e7b23f8d6815a6c7ab50629e8952c0d4 WHIRLPOOL 114c4ffe45f9a482a0657c65926535dc5a02525210d49c28270de9a733c9bc437ef217a490e4a7760527722eb763a4c85960ab366cc6744a0323ccec982c2fb3
diff --git a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.7.2.ebuild b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.7.2.ebuild
deleted file mode 100644
index 4bde5ece8009..000000000000
--- a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.7.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.7.2.ebuild,v 1.3 2014/03/01 22:27:46 mgorny Exp $
-
-EAPI="3"
-
-DESCRIPTION="PKCS#11 support for GnuPG"
-HOMEPAGE="http://gnupg-pkcs11.sourceforge.net"
-SRC_URI="mirror://sourceforge/gnupg-pkcs11/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="=dev-libs/libassuan-2*
-	>=dev-libs/libgcrypt-1.2.2:0
-	>=dev-libs/libgpg-error-1.3
-	>=dev-libs/openssl-0.9.7
-	>=dev-libs/pkcs11-helper-1.02"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf --docdir="/usr/share/doc/${PF}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	prepalldocs
-}
diff --git a/app-crypt/gpgme/gpgme-1.5.5.ebuild b/app-crypt/gpgme/gpgme-1.5.5.ebuild
index e6cbd41fae4c..eb1230b12873 100644
--- a/app-crypt/gpgme/gpgme-1.5.5.ebuild
+++ b/app-crypt/gpgme/gpgme-1.5.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/app-crypt/gpgme/gpgme-1.5.5.ebuild,v 1.2 2015/06/26 08:39:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gpgme/gpgme-1.5.5.ebuild,v 1.3 2015/06/27 09:48:10 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="1/11" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="common-lisp static-libs"
 
 DEPEND="app-crypt/gnupg
diff --git a/app-crypt/hmaccalc/Manifest b/app-crypt/hmaccalc/Manifest
index 50de1dda7ff5..a3d6cd1cdc8f 100644
--- a/app-crypt/hmaccalc/Manifest
+++ b/app-crypt/hmaccalc/Manifest
@@ -1,2 +1 @@
-DIST hmaccalc-0.9.12.tar.gz 98795 SHA256 5be00d6e17dcac7e58812c6d1426e46d675e6a134c02df7751ad2d5844bb5028 SHA512 eb5e0a4356a84252662d69b51f612bf7a46149cb6170bcf429c9de0abee513840fabd83f7ee261df90c0489aa8be1b6cd47d95f87d6ac4c7697bd4f7d16a1819 WHIRLPOOL ae22c9837e580a5a8c1c513b99d164c1f46553d4a78d1b7ff325f9a0f8c28653246877da095907326de927c5a3a0252d9199453bd3966244c4aed79e61435b29
 DIST hmaccalc-0.9.13.tar.gz 106979 SHA256 9a00b507555e45f58c1659d28f4d27e63373735a30cfe70e2c939f679cd266cc SHA512 899e95dcebf85dbb64ea543d530e3819c2dd72dfbdc1f06e7f37418f9045a8018c49ace96c6090e08b18406edc3efa196ea9fcd9b7b8d8e151f80b2eaba512c0 WHIRLPOOL 7af722b3875656113f7a7fa67a9e9bf2014b1b2873cf601f512dd361a40894fae94c667c06ec5f16291df459ea8c8d4634f828645d62eb6560350b22cd684506
diff --git a/app-crypt/hmaccalc/hmaccalc-0.9.12.ebuild b/app-crypt/hmaccalc/hmaccalc-0.9.12.ebuild
deleted file mode 100644
index e99e8eb4cf45..000000000000
--- a/app-crypt/hmaccalc/hmaccalc-0.9.12.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/hmaccalc/hmaccalc-0.9.12.ebuild,v 1.2 2014/08/04 03:52:42 robbat2 Exp $
-
-EAPI=3
-inherit eutils multilib
-
-DESCRIPTION="Tools for computing and checking HMAC values for files"
-HOMEPAGE="https://fedorahosted.org/hmaccalc/"
-SRC_URI="https://fedorahosted.org/released/hmaccalc/hmaccalc-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/nss
-		sys-devel/prelink"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		--enable-sum-directory=/usr/$(get_libdir)/${PN}/ \
-	|| die "econf failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc README
-}
diff --git a/app-crypt/kencfs/kencfs-1.5.0.ebuild b/app-crypt/kencfs/kencfs-1.5.0.ebuild
index 20ca315f6412..8d3e548a1933 100644
--- a/app-crypt/kencfs/kencfs-1.5.0.ebuild
+++ b/app-crypt/kencfs/kencfs-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/app-crypt/kencfs/kencfs-1.5.0.ebuild,v 1.2 2015/06/04 18:58:27 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/kencfs/kencfs-1.5.0.ebuild,v 1.3 2015/06/27 09:48:40 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://kde-apps.org/CONTENT/content-files/134003-${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-crypt/libsecret/Manifest b/app-crypt/libsecret/Manifest
index 31c6ad9eed37..857d6784b06b 100644
--- a/app-crypt/libsecret/Manifest
+++ b/app-crypt/libsecret/Manifest
@@ -1,3 +1,2 @@
-DIST libsecret-0.16.tar.xz 499888 SHA256 b859406c490a2011b35f5940235304315b343f2efd554800285f24b95e14f218 SHA512 2223861439733bf0e97d59236327aded8d17f89ce81aff17bd18c632960e7024c43be1480cd4591495401ac161dcb725d3d5fcd0b43120bfc6472c4a021ed770 WHIRLPOOL 32c7edafa67d0b26c9ec1d87d42ee4ff47abd134f34189a1b22d5c89b7386fa4403321c8595f587f6c02da36c5ce6e313e8ef7841527ddc1990efe8323194183
 DIST libsecret-0.18.2.tar.xz 483980 SHA256 12fd288b012e1b2b1b54d586cd4c6507885715534644b4534b7ef7d7079ba443 SHA512 414580e2f717ba0a3adacd79da093dc5e982f49455c1d6dd0cc60d87d7d3ff9ce3147685a3f5091488b9c98840002739b9e1aa2252f0fd71639b471b34ff5c54 WHIRLPOOL 2c113d81893562a54eef28c095968dca43ef5c6e940b20eb9266034d29231e3bbcb173855a6db3695a294f0028012fd45ccd8d5330e34a9c1a3abd9c041e01b6
 DIST libsecret-0.18.tar.xz 480520 SHA256 0c73aa762dbd1e38ba7b03de350e23ce818cb810b0784375e95ef61e004b02e3 SHA512 5b3b460fe45b780fd4018dbb3b5fcc2c2e775725a8c74f4cfa86c00c643ccc1b29961b7e464c7b01846c5cc16a4bb9819c74016dd6758301ae2f67ab947c35bd WHIRLPOOL 2c3cb1a6a902665b3898a211317316d988791648d1d1f7144160f12376b2110ac99e8c3d3423ceb58a8ea0a3fb50efb42fc458aaa44f3aea52d2a1fab2d959a8
diff --git a/app-crypt/libsecret/libsecret-0.16.ebuild b/app-crypt/libsecret/libsecret-0.16.ebuild
deleted file mode 100644
index a3daf46c5cc5..000000000000
--- a/app-crypt/libsecret/libsecret-0.16.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.16.ebuild,v 1.14 2015/04/08 07:30:34 mgorny Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-VALA_MIN_API_VERSION=0.18
-VALA_USE_DEPEND=vapigen
-
-inherit eutils gnome2 python-any-r1 vala virtualx
-
-DESCRIPTION="GObject library for accessing the freedesktop.org Secret Service API"
-HOMEPAGE="https://live.gnome.org/Libsecret"
-
-LICENSE="LGPL-2.1+ Apache-2.0" # Apache-2.0 license is used for tests only
-SLOT="0"
-IUSE="+crypt debug +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32.0:2
-	crypt? ( >=dev-libs/libgcrypt-1.2.2:0= )
-	introspection? ( >=dev-libs/gobject-introspection-1.29 )"
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-keyring-3"
-# Add ksecrets to RDEPEND when it's added to portage
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.35.0
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		dev-python/mock
-		introspection? (
-			${PYTHON_DEPS}
-			>=dev-libs/gjs-1.32
-			dev-python/pygobject:3 )
-	)
-	vala? ( $(vala_depend) )"
-
-src_prepare() {
-	# FIXME: disable failing test
-	sed -e '/test_get_sync);/d' \
-		-e '/test_get_async);/d' \
-		-i libsecret/tests/test-service.c || die
-
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	gnome2_src_configure \
-		--enable-manpages \
-		--disable-strict \
-		--disable-coverage \
-		--disable-static \
-		$(use_enable crypt gcrypt) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
-
-src_test() {
-	Xemake check
-}
diff --git a/app-crypt/libsecret/libsecret-0.18.2.ebuild b/app-crypt/libsecret/libsecret-0.18.2.ebuild
index 782ec368230a..a0612025a625 100644
--- a/app-crypt/libsecret/libsecret-0.18.2.ebuild
+++ b/app-crypt/libsecret/libsecret-0.18.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-crypt/libsecret/libsecret-0.18.2.ebuild,v 1.4 2015/06/26 09:20:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.18.2.ebuild,v 1.5 2015/06/26 23:13:21 tetromino Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -18,16 +18,16 @@ IUSE="+crypt debug +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd"
 
-COMMON_DEPEND="
+RDEPEND="
 	>=dev-libs/glib-2.38:2
 	crypt? ( >=dev-libs/libgcrypt-1.2.2:0= )
 	introspection? ( >=dev-libs/gobject-introspection-1.29 )
 "
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-keyring-3
+PDEPEND=">=gnome-base/gnome-keyring-3
 "
-# Add ksecrets to RDEPEND when it's added to portage
-DEPEND="${COMMON_DEPEND}
+# PDEPEND to avoid circular dep (bug #547456)
+# Add ksecrets to PDEPEND when it's added to portage
+DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	dev-util/gdbus-codegen
 	>=dev-util/gtk-doc-am-1.9
diff --git a/app-crypt/libsecret/libsecret-0.18.ebuild b/app-crypt/libsecret/libsecret-0.18.ebuild
index 2931e5da5bc0..e46e002a5a60 100644
--- a/app-crypt/libsecret/libsecret-0.18.ebuild
+++ b/app-crypt/libsecret/libsecret-0.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-crypt/libsecret/libsecret-0.18.ebuild,v 1.11 2015/04/08 07:30:34 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/libsecret/libsecret-0.18.ebuild,v 1.12 2015/06/26 23:13:21 tetromino Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -18,16 +18,16 @@ IUSE="+crypt debug +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
 KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 
-COMMON_DEPEND="
+RDEPEND="
 	>=dev-libs/glib-2.38:2
 	crypt? ( >=dev-libs/libgcrypt-1.2.2:0= )
 	introspection? ( >=dev-libs/gobject-introspection-1.29 )
 "
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/gnome-keyring-3
+PDEPEND=">=gnome-base/gnome-keyring-3
 "
-# Add ksecrets to RDEPEND when it's added to portage
-DEPEND="${COMMON_DEPEND}
+# PDEPEND to avoid circular dep (bug #547456)
+# Add ksecrets to PDEPEND when it's added to portage
+DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	dev-util/gdbus-codegen
 	>=dev-util/gtk-doc-am-1.9
diff --git a/app-crypt/mcrypt/mcrypt-2.6.8-r1.ebuild b/app-crypt/mcrypt/mcrypt-2.6.8-r1.ebuild
deleted file mode 100644
index 3907c7bbd304..000000000000
--- a/app-crypt/mcrypt/mcrypt-2.6.8-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mcrypt/mcrypt-2.6.8-r1.ebuild,v 1.6 2012/02/18 08:34:38 radhermit Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="replacement of the old unix crypt(1)"
-HOMEPAGE="http://mcrypt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mcrypt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~x86-macos"
-IUSE="nls"
-
-DEPEND=">=dev-libs/libmcrypt-2.5.8
-	>=app-crypt/mhash-0.9.9
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.6.7-qa.patch"
-	epatch "${FILESDIR}/${P}-stdlib.h.patch"
-}
-
-src_configure() {
-	econf $(use_enable nls)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS NEWS README THANKS TODO
-}
diff --git a/app-crypt/md4sum/md4sum-0.02.03.ebuild b/app-crypt/md4sum/md4sum-0.02.03.ebuild
deleted file mode 100644
index 80f3f214467d..000000000000
--- a/app-crypt/md4sum/md4sum-0.02.03.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/md4sum/md4sum-0.02.03.ebuild,v 1.6 2009/07/13 12:28:29 flameeyes Exp $
-
-inherit eutils
-
-DESCRIPTION="md4 and edonkey hash algorithm tool"
-HOMEPAGE="http://absinth.dyndns.org/linux/c/"
-SRC_URI="http://absinth.dyndns.org/linux/c/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE=""
-
-src_compile() {
-	econf || die "econf failed"
-	sed -i -e "s:CFLAGS=:CFLAGS=${CFLAGS} :g" \
-		-e "s:install -s:install:g" Makefile
-	emake LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" || die "emake failed"
-}
-
-src_install() {
-	mkdir -p "${D}/usr/bin"
-	mkdir -p "${D}/usr/share/man/man1"
-	einstall || die "einstall failed"
-}
diff --git a/app-crypt/mhash/Manifest b/app-crypt/mhash/Manifest
index 4a1188e3a7fe..cd4ce6bccdba 100644
--- a/app-crypt/mhash/Manifest
+++ b/app-crypt/mhash/Manifest
@@ -1,2 +1 @@
 DIST mhash-0.9.9.9.tar.gz 931437 SHA256 3dcad09a63b6f1f634e64168dd398e9feb9925560f9b671ce52283a79604d13e SHA512 82ad8b8e9b0463c5a14f5c0e572badc42c4697bac5505443b144287b3f8510b1410721b4277f092a0d6045c4342e997831011cdfcbfa8f1dae6edd5d9e3cefee WHIRLPOOL d1a77b1ccb172af9ee4c7769b6f1d1f53f3b7cb1d87f7aad0c5fb64ae40302f21134a1cd05447dd766bc4408ae2dbb014db77d68a052a57131c955d3ca6453c2
-DIST mhash-0.9.9.tar.gz 919622 SHA256 a61d4f30f3377afd41e316e53f1d6a9a829f34d20add0e4bb29752cb01435c77 SHA512 3f32cdb6428d1941c7dce3d2bd2a516fd66b4f1bd595c5d429f592e4e45c2a12247bd93bcb2208637e8d8e7f284f1a730caad262c0c9f4bbd0dc2f8604cd98db WHIRLPOOL 70b8667d160cb686b41a87588043a3a5b2ffd0a662f7bc7f9fd8bb45526dd266f11557b1934cdeda651c4b219b068ed98908a8212e94abfa79930785e3691872
diff --git a/app-crypt/mhash/mhash-0.9.9-r1.ebuild b/app-crypt/mhash/mhash-0.9.9-r1.ebuild
deleted file mode 100644
index 218e907851cb..000000000000
--- a/app-crypt/mhash/mhash-0.9.9-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/mhash/mhash-0.9.9-r1.ebuild,v 1.8 2008/06/08 21:38:23 the_paya Exp $
-
-inherit eutils
-
-DESCRIPTION="library providing a uniform interface to a large number of hash algorithms"
-HOMEPAGE="http://mhash.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mhash/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	# Fix for issues in bug #181563
-	unpack ${A} && cd "${S}"
-	epatch "${FILESDIR}/${P}-mutils-align.patch"
-}
-
-src_compile() {
-	econf \
-		--enable-static \
-		--enable-shared || die
-	emake || die "make failure"
-	cd doc && emake mhash.html || die "failed to build html"
-}
-
-src_install() {
-	dodir /usr/{bin,include,lib}
-	make install DESTDIR="${D}" || die "install failure"
-
-	dodoc AUTHORS INSTALL NEWS README TODO THANKS ChangeLog
-	dodoc doc/*.txt doc/skid* doc/*.c
-	dohtml doc/mhash.html || die "dohtml failed"
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.13.2.ebuild b/app-crypt/mit-krb5/mit-krb5-1.13.2.ebuild
index f20c46b1da29..018d767904d0 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.13.2.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.13.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-crypt/mit-krb5/mit-krb5-1.13.2.ebuild,v 1.6 2015/06/26 08:05:17 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/mit-krb5/mit-krb5-1.13.2.ebuild,v 1.8 2015/06/28 08:50:55 zlogene Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}-signed.tar"
 
 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="doc +keyutils openldap +pkinit selinux +threads test xinetd"
 
 CDEPEND="
diff --git a/app-crypt/openvpn-blacklist/Manifest b/app-crypt/openvpn-blacklist/Manifest
index 528f04006ee5..8f42e2e0a1f0 100644
--- a/app-crypt/openvpn-blacklist/Manifest
+++ b/app-crypt/openvpn-blacklist/Manifest
@@ -1,2 +1 @@
-DIST openvpn-blacklist_0.3.tar.gz 1807855 SHA256 c87ba48715873f5029e98b38ad0263c240fb91f9b4a2217db3e65fb8ecfe0b44 SHA512 c098281bbfcab27cb80f19080bd903236b256254cc6cfbdea87af8f3f96f4bf1ee1ae6729fb985e1db5bcf13280d3fe51d06378b1b7a38be64ce01d0ef160b72 WHIRLPOOL c188a8542991fb15601632294c00329d663a8ce5b28ba9248e73df231b047db680e579198d3db199e637f7a8b72a270d09183429101769db0b215b42313a6edd
 DIST openvpn-blacklist_0.4.tar.gz 1808103 SHA256 01d0cddab3db957661dc8019c1b672068699f1f7cf8633748b6222601ecb0108 SHA512 3301f7425520eb086306acb30bd718465208b5aa5606e879b65f936161d1955b93254d9c1dd6f5d66ec6480850652afadabb05db2a0df9fd5acb73a5ed5c19e3 WHIRLPOOL 7eba98ff8e1281e5008f01a360aa37aba87a494d187ef1a83599aa57d16cb2980e021af4ee25abc92c83eee1a8c287b4567f671a4bca0753ef1ea68120aa2600
diff --git a/app-crypt/openvpn-blacklist/openvpn-blacklist-0.3.ebuild b/app-crypt/openvpn-blacklist/openvpn-blacklist-0.3.ebuild
deleted file mode 100644
index bb90a31bff6a..000000000000
--- a/app-crypt/openvpn-blacklist/openvpn-blacklist-0.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/openvpn-blacklist/openvpn-blacklist-0.3.ebuild,v 1.1 2008/06/19 15:26:37 hanno Exp $
-
-DESCRIPTION="Detection of weak openvpn keys produced by certain debian versions between 2006 and 2008"
-HOMEPAGE="http://packages.debian.org/sid/openvpn-blacklist"
-SRC_URI="mirror://debian/pool/main/o/${PN}/${PN}_${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="dev-lang/python"
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	einfo nothing to compile
-}
-
-src_install() {
-	dobin openvpn-vulnkey || die "dobin failed"
-	doman openvpn-vulnkey.1 || die "doman failed"
-	dodir /usr/share/openvpn-blacklist/
-	cat "${S}/debian/blacklist.prefix" > "${D}/usr/share/openssl-blacklist/blacklist.RSA-2048"
-	cat "${S}/blacklist.RSA-2048" | cut -d ' ' -f 2 | cut -b13- | sort \
-		>> "${D}/usr/share/openvpn-blacklist/blacklist.RSA-2048"
-}
diff --git a/app-crypt/openvpn-blacklist/openvpn-blacklist-0.4.ebuild b/app-crypt/openvpn-blacklist/openvpn-blacklist-0.4.ebuild
deleted file mode 100644
index 279bb1495f1c..000000000000
--- a/app-crypt/openvpn-blacklist/openvpn-blacklist-0.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/openvpn-blacklist/openvpn-blacklist-0.4.ebuild,v 1.1 2009/06/28 11:04:10 hanno Exp $
-
-DESCRIPTION="Detection of weak openvpn keys produced by certain debian versions between 2006 and 2008"
-HOMEPAGE="http://packages.debian.org/sid/openvpn-blacklist"
-SRC_URI="mirror://debian/pool/main/o/${PN}/${PN}_${PV}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="dev-lang/python"
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	einfo nothing to compile
-}
-
-src_install() {
-	dobin openvpn-vulnkey || die "dobin failed"
-	doman openvpn-vulnkey.1 || die "doman failed"
-	dodir /usr/share/openvpn-blacklist/
-	cat "${S}/debian/blacklist.prefix" > "${D}/usr/share/openssl-blacklist/blacklist.RSA-2048"
-	cat "${S}/blacklist.RSA-2048" | cut -d ' ' -f 2 | cut -b13- | sort \
-		>> "${D}/usr/share/openvpn-blacklist/blacklist.RSA-2048"
-}
diff --git a/app-crypt/qca/qca-2.1.0.3.ebuild b/app-crypt/qca/qca-2.1.0.3.ebuild
index 8d2812974893..d9e5541131d9 100644
--- a/app-crypt/qca/qca-2.1.0.3.ebuild
+++ b/app-crypt/qca/qca-2.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/app-crypt/qca/qca-2.1.0.3.ebuild,v 1.7 2015/04/02 14:06:37 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/qca/qca-2.1.0.3.ebuild,v 1.9 2015/06/28 09:56:14 zlogene Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/src/${MY_PN}-${PV}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 
 IUSE="botan debug doc examples gcrypt gpg logger nss +openssl pkcs11 +qt4 qt5 sasl softstore test"
 REQUIRED_USE="|| ( qt4 qt5 )"
diff --git a/app-crypt/seahorse/seahorse-3.16.0-r1.ebuild b/app-crypt/seahorse/seahorse-3.16.0-r1.ebuild
index 7561308e1b0e..306e9475d5ec 100644
--- a/app-crypt/seahorse/seahorse-3.16.0-r1.ebuild
+++ b/app-crypt/seahorse/seahorse-3.16.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/app-crypt/seahorse/seahorse-3.16.0-r1.ebuild,v 1.1 2015/06/19 16:56:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.16.0-r1.ebuild,v 1.2 2015/06/28 10:18:10 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -31,6 +31,7 @@ COMMON_DEPEND="
 	zeroconf? ( >=net-dns/avahi-0.6:= )
 "
 DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
 	>=dev-util/intltool-0.35
 	sys-devel/gettext
 	virtual/pkgconfig
diff --git a/app-crypt/seahorse/seahorse-3.16.0.ebuild b/app-crypt/seahorse/seahorse-3.16.0.ebuild
deleted file mode 100644
index 2880675dc45a..000000000000
--- a/app-crypt/seahorse/seahorse-3.16.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-3.16.0.ebuild,v 1.1 2015/06/09 10:04:01 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="A GNOME application for managing encryption keys"
-HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-IUSE="debug ldap zeroconf"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.11.91:=
-	>=dev-libs/glib-2.10:2
-	>=x11-libs/gtk+-3.4:3
-	>=app-crypt/libsecret-0.16
-	>=net-libs/libsoup-2.33.92:2.4
-	x11-misc/shared-mime-info
-
-	net-misc/openssh
-	>=app-crypt/gpgme-1
-	>=app-crypt/gnupg-1.4
-	<app-crypt/gnupg-2.1
-
-	ldap? ( net-nds/openldap:= )
-	zeroconf? ( >=net-dns/avahi-0.6:= )
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# Need seahorse-plugins git snapshot
-RDEPEND="${COMMON_DEPEND}
-	!<app-crypt/seahorse-plugins-2.91.0_pre20110114
-"
-
-src_prepare() {
-	# Do not mess with CFLAGS with USE="debug"
-	sed -e '/CFLAGS="$CFLAGS -g/d' \
-		-e '/CFLAGS="$CFLAGS -O0/d' \
-		-i configure.ac configure || die "sed 1 failed"
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# bindir is needed due to bad macro expansion in desktop file, bug #508610
-	gnome2_src_configure \
-		--bindir=/usr/bin \
-		--enable-pgp \
-		--enable-ssh \
-		--enable-pkcs11 \
-		--enable-hkp \
-		$(use_enable debug) \
-		$(use_enable ldap) \
-		$(use_enable zeroconf sharing) \
-		ITSTOOL=$(type -P true) \
-		VALAC=$(type -P true)
-}
diff --git a/app-doc/edox-data/Manifest b/app-doc/edox-data/Manifest
index 8f8c9f4e6f06..811cd100abd2 100644
--- a/app-doc/edox-data/Manifest
+++ b/app-doc/edox-data/Manifest
@@ -1,2 +1 @@
-DIST e16-docs-0.16.8-0.02.tar.gz 2102984 SHA256 eb81bc5b344727b27a662295ff4ba7f9f43a264c33206a243f77eb38119c7d44 SHA512 cf7c2110f0e4e381266324e456f03c5cb0b959e46c42e1f906e1057ec7649d1036a584f5a1355ac64c9a334238f72760d3e9df25e3307363b07a5a514ee222c1 WHIRLPOOL 255dc6be9825a99f5443b57438472a9e41bfe6111e6dfbae5037b5d147fa3a924eb4aec41ec25c77479c9e27421495f1fb7b1ff65ef969d1779084ae6becec28
 DIST e16-docs-0.16.8.0.2.tar.gz 1655229 SHA256 b8d8e0caf45931ce672fa5088a963685533a65a9a8cfeee15239d96f3b91593f SHA512 df46cedff63984f5fe3cd4d523406efc3b4334447cbe9e31abae969961142887c5891bad7c65b066bb077f69789de4d38718872554e4a23f3b5b853bda665e31 WHIRLPOOL a24d27306a83717a1f47ae84c7cb2ae0e33647594bcc05caf24b8c3ce4a6401bd0f8675e6f973b4632a967a22fe7dcd5cebf07ab40170cc510e0cc010c8ae10e
diff --git a/app-doc/edox-data/edox-data-0.16.8_pre2.ebuild b/app-doc/edox-data/edox-data-0.16.8_pre2.ebuild
deleted file mode 100644
index 0c491ce4dd02..000000000000
--- a/app-doc/edox-data/edox-data-0.16.8_pre2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/edox-data/edox-data-0.16.8_pre2.ebuild,v 1.1 2006/10/22 05:40:11 vapier Exp $
-
-inherit eutils
-
-EVER="${PV/_pre*}"
-EDOXVER="${EVER}-0.0${PV/*_pre}"
-DESCRIPTION="The Enlightenment online help"
-HOMEPAGE="http://www.enlightenment.org/"
-SRC_URI="mirror://sourceforge/enlightenment/e16-docs-${EDOXVER}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=x11-wm/enlightenment-0.16.8"
-
-S=${WORKDIR}/e16-docs-${EDOXVER}
-
-src_compile() {
-	econf --enable-fsstd || die
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/app-editors/neovim/Manifest b/app-editors/neovim/Manifest
index e710c1f51bdb..9af1dc837064 100644
--- a/app-editors/neovim/Manifest
+++ b/app-editors/neovim/Manifest
@@ -1,3 +1,4 @@
 DIST neovim-0.0.0_pre20150225.tar.xz 4768060 SHA256 c2b9e1d60d5006022938c0cef0a25178a8fc3aefe469dc555b9396f8240dd82b SHA512 7854aabd9384bf5c90cec2f478aa9b2f173f03d7f3a1f8645e3331a7f20cade58cf68e13a117785905564d09f5b6029d22aa9ea7263f739385135becfbd50ced WHIRLPOOL d0cf544d18d925fb809f1a4dcfc1622733a7079313d8c4462efd3c371ebb5db27a4c442a0913b122c0d2ed5e1c37dca605bbfc99ed4dd920a2b006eba0d98930
 DIST neovim-0.0.0_pre20150329.tar.xz 4782732 SHA256 424bf8863ff27da83aa51b71d1677eb5f98d3a962d4ce14206a506d86a9ea12e SHA512 3f5b9901fa8ecd5d36dded502eacb0ba479b5893d3678f6e309696ad2e9b695c2a8589bb084b1f61d96fe025ba8b66addbd15493b2dc181d10a5ed3f6c2a33a3 WHIRLPOOL 93ea0a259961811d45b3cdcd9b05ddcbbb4215f9a56571e34787e1abe5af802ffb2a29d9dc81599a60902834cc94e316e1a69906d560ed463d308677d80242a5
 DIST neovim-0.0.0_pre20150505.tar.xz 4769060 SHA256 682b58ebee204f5148cc3d47de48ff60cd7ffde8e84f1aa22553e638ea9aef9c SHA512 52a036552f19fa4a6a3f3f4a2ff760f26870f3423dc348ae05ed06ceccdf4fa5038b6ca7710553bbae76f7631a0b6e078dd9b0eb475265cd62b859f5e6211864 WHIRLPOOL 97653c702e97e36b3affa9b248762801b64aec9e44ce2199dbe365645217ab9573518d82869c78cea15982c180fa77665b044a3cd309c2369e9c8175e266867f
+DIST neovim-0.0.0_pre20150627.tar.xz 4715400 SHA256 5e5769c81a60637b731dc13e7584b6f91c7a4f2fa9116c7d688b938aa000ab69 SHA512 44f527e82dc8d70735110b7da687b87fb622127078dd32b9d8b284d8f3c3bce2c9978640234583f130e71378190c29e9c37cc19be8fd994eb338d1d9a5a98701 WHIRLPOOL 08125b0a0d96d2f5202b314e85b26e32e7aaf2170dfa69df660b2d36ad3218b24a9313c6f7a7c0e0ed8677a717e5d478851d1dc6bc8c020dc6798e3dd4462a2d
diff --git a/app-editors/neovim/neovim-0.0.0_pre20150627.ebuild b/app-editors/neovim/neovim-0.0.0_pre20150627.ebuild
new file mode 100644
index 000000000000..a4aa850da23d
--- /dev/null
+++ b/app-editors/neovim/neovim-0.0.0_pre20150627.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/neovim/neovim-0.0.0_pre20150627.ebuild,v 1.1 2015/06/27 03:54:39 yngwin Exp $
+
+EAPI=5
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Vim's rebirth for the 21st century"
+HOMEPAGE="https://github.com/neovim/neovim"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="git://github.com/neovim/neovim.git"
+else
+	SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0 vim"
+SLOT="0"
+IUSE="perl python"
+
+CDEPEND="dev-lang/luajit:2
+	>=dev-libs/libtermkey-0.17
+	dev-libs/libvterm-neovim
+	>=dev-libs/unibilium-1.1.1
+	>=dev-libs/libuv-1.2.0
+	>=dev-libs/msgpack-0.6.0_pre20150220
+	dev-lua/lpeg
+	dev-lua/messagepack"
+DEPEND="${CDEPEND}
+	virtual/libiconv
+	virtual/libintl"
+RDEPEND="${CDEPEND}
+	perl? ( dev-lang/perl )
+	python? ( dev-python/neovim-python-client )"
+
+src_prepare() {
+	# use our system vim dir
+	sed -e '/^# define SYS_VIMRC_FILE/s|$VIM|'"${EPREFIX}"'/etc/vim|' \
+		-i src/nvim/os_unix_defs.h || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	export USE_BUNDLED_DEPS=OFF
+	append-cflags "-Wno-error"
+	append-cppflags "-DNDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1"
+	local mycmakeargs=(
+		-DCMAKE_BUILD_TYPE=Release
+		-DLIBUNIBILIUM_USE_STATIC=OFF
+		-DLIBTERMKEY_USE_STATIC=OFF
+		-DLIBVTERM_USE_STATIC=OFF
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	# install a default configuration file
+	insinto /etc/vim
+	doins "${FILESDIR}"/nvimrc
+}
diff --git a/app-i18n/ibus/ibus-1.5.10.ebuild b/app-i18n/ibus/ibus-1.5.10.ebuild
index 762fe39edb33..9497669df7e2 100644
--- a/app-i18n/ibus/ibus-1.5.10.ebuild
+++ b/app-i18n/ibus/ibus-1.5.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/app-i18n/ibus/ibus-1.5.10.ebuild,v 1.1 2015/02/28 15:36:43 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus/ibus-1.5.10.ebuild,v 1.2 2015/06/26 14:28:44 ago Exp $
 
 EAPI=5
 
@@ -18,7 +18,7 @@ HOMEPAGE="http://code.google.com/p/ibus/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X"
 REQUIRED_USE="
 	|| ( gtk gtk3 X )
diff --git a/app-i18n/x-unikey/x-unikey-1.0.4-r1.ebuild b/app-i18n/x-unikey/x-unikey-1.0.4-r1.ebuild
deleted file mode 100644
index 1ee4595f09ea..000000000000
--- a/app-i18n/x-unikey/x-unikey-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/x-unikey-1.0.4-r1.ebuild,v 1.7 2015/02/13 04:33:28 naota Exp $
-
-EAPI="1"
-
-inherit autotools eutils multilib gnome2-utils
-
-DESCRIPTION="Vietnamese X Input Method"
-HOMEPAGE="http://www.unikey.org/"
-SRC_URI="mirror://sourceforge/unikey/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="nls gtk"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libSM
-	x11-libs/libICE
-	gtk? ( >=x11-libs/gtk+-2.2:2 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-libs/glib
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	eautoreconf
-}
-
-src_compile() {
-	local myconf
-	# --with-gtk-sysconfdir to prevent sandbox violation only
-	use gtk && myconf="--with-unikey-gtk --with-gtk-sysconfdir=${GTK2_CONFDIR}"
-	econf ${myconf} || die "./configure failed"
-	emake || die
-}
-
-src_install() {
-	if use gtk;then
-		dodir "${GTK2_CONFDIR}"
-#		emake DESTDIR="${D}" install -C src/unikey-gtk || die
-	fi
-#	dobin src/xim/ukxim src/gui/unikey
-	emake DESTDIR="${D}" install || die
-	doenvd "${FILESDIR}/01x-unikey"
-
-	dodoc AUTHORS CREDITS ChangeLog NEWS README TODO
-	cd doc
-	dodoc README1ST keymap-syntax manual options ukmacro \
-		unikey-manual-0.9.pdf unikey.png unikeyrc
-}
-
-pkg_postinst() {
-	elog
-	elog "Go to /etc/env.d/01x-unikey and uncomment appropriate lines"
-	elog "to enable x-unikey"
-	elog
-	if use gtk; then
-		gnome2_query_immodules_gtk2
-		elog "If you want to use x-unikey as the default gtk+ input method,"
-		elog "change GTK_IM_MODULE in /etc/env.d/01x-unikey to \"unikey\""
-		elog
-	fi
-}
-
-pkg_postrm() {
-	use gkt && gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/x-unikey/x-unikey-1.0.4-r2.ebuild b/app-i18n/x-unikey/x-unikey-1.0.4-r2.ebuild
index 0c06676a49d0..707e4ba1dc81 100644
--- a/app-i18n/x-unikey/x-unikey-1.0.4-r2.ebuild
+++ b/app-i18n/x-unikey/x-unikey-1.0.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/app-i18n/x-unikey/x-unikey-1.0.4-r2.ebuild,v 1.2 2015/04/21 02:22:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/x-unikey-1.0.4-r2.ebuild,v 1.3 2015/06/28 10:14:55 zlogene Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/unikey/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="nls gtk"
 
 RDEPEND="x11-libs/libX11
diff --git a/app-misc/datovka/datovka-3.0.3-r1.ebuild b/app-misc/datovka/datovka-3.0.3-r1.ebuild
index 4d612997fe34..8302e254a406 100644
--- a/app-misc/datovka/datovka-3.0.3-r1.ebuild
+++ b/app-misc/datovka/datovka-3.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-misc/datovka/datovka-3.0.3-r1.ebuild,v 1.2 2015/04/08 07:30:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/datovka/datovka-3.0.3-r1.ebuild,v 1.3 2015/06/27 09:48:30 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.nic.cz/public_media/datove_schranky/releases/src/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-misc/freemind/Manifest b/app-misc/freemind/Manifest
index 925d98105910..00250a522dd3 100644
--- a/app-misc/freemind/Manifest
+++ b/app-misc/freemind/Manifest
@@ -1,3 +1 @@
-DIST freemind-src-0.9.0.tar.gz 15195546 SHA256 aef65c79d315c2055651f4adaa9fd0cd27514aa49dde6aca470d80ce5f19a5e1 SHA512 c03b6854b735a66022d36bc09a31cd3e0c2b8f4f0031a05cf8f50f0b740a43560c20551b8f08d6e0efe126fcf81a7958809f52166c3b0b0bce5229a2f9f49f4e WHIRLPOOL 9b86230b50c564c9375d6becdf1ec88e56244b79a6f9ba49f05783bf23e5a11bae9773a1d34bacca14f3b53230c27b56afca7d8985ff4e6f52131d41c4b54400
-DIST freemind-src-1.0.0.tar.gz 31444914 SHA256 27daa9c9dd13129d79f9e0eb956d22f68039074199ed3569f62edcb070ccb686 SHA512 a4e8d328f01c990521a8ed891bf80e5dbdc89bef2d2ba3c07d47a22e41e8f18fdf4f6e7b0feca351311fc420d23fb1b45152e9ab782e97185899e6b053c8586b WHIRLPOOL e3465fadb96a7c2cdf98805da20557db0956f8ed41d692d714759fd94b3d71ccf48f79af28633cbcfe7d0209b1b19f76f44660f2fa3a52c02ef0c0bdebfefd93
 DIST freemind-src-1.0.1.tar.gz 31617138 SHA256 018285126b27eae7392b8c3bfb513f25bd70b9907440e5eb8209f20b4fbd8619 SHA512 f3b7bd526da3075e883292fc88dd5b01f5b0112c58cfeae25a6be9c7dbf4a5444839821e3e2554303032d832b4520fa742894c09ded2705270f51aca98167fb5 WHIRLPOOL 5c3e1c795060bb92bced84fcf785c721c0ecf2ea8fcd8440cfe4935255bb4685c78dc4ad5991ee425a3c7d37589a8698ee9e1b3e4c63d362bc172edbe4e281da
diff --git a/app-misc/freemind/freemind-0.9.0-r1.ebuild b/app-misc/freemind/freemind-0.9.0-r1.ebuild
deleted file mode 100644
index 73531c47f47d..000000000000
--- a/app-misc/freemind/freemind-0.9.0-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-0.9.0-r1.ebuild,v 1.6 2014/03/31 16:48:09 mgorny Exp $
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Mind-mapping software written in Java"
-HOMEPAGE="http://freemind.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x64-macos"
-IUSE="groovy latex pdf svg"
-
-COMMON_DEP="
-	dev-java/javahelp:0
-	dev-java/jgoodies-forms:0
-	dev-java/jibx:0
-	>=dev-java/simplyhtml-0.13.1:0
-	groovy? ( dev-java/groovy )
-	latex? ( dev-java/hoteqn:0 )
-	pdf? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 )
-	svg? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 )"
-DEPEND="dev-lang/python
-	>=virtual/jdk-1.4
-	pdf? ( dev-java/avalon-framework:4.2 )
-	svg? ( dev-java/avalon-framework:4.2 )
-	${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${PN}"
-
-# Moved from the eclass to clean it up from python and this ebuild is
-# the last consumer. Additionally, the newer version no longer requires
-# it so it will die along with this one.
-java-ant_remove-taskdefs() {
-	debug-print-function ${FUNCNAME} $*
-	local task_name
-	if [[ "${1}" == --name ]]; then
-		task_name="${2}"
-		shift 2
-	fi
-	local file="${1:-build.xml}"
-	echo "Removing taskdefs from ${file}"
-	python <<EOF
-import sys
-from xml.dom.minidom import parse
-dom = parse("${file}")
-for elem in dom.getElementsByTagName('taskdef'):
-	if (len("${task_name}") == 0 or elem.getAttribute("name") == "${task_name}"):
-		elem.parentNode.removeChild(elem)
-		elem.unlink()
-f = open("${file}", "w")
-dom.writexml(f)
-f.close()
-EOF
-	[[ $? != 0 ]] && die "Removing taskdefs failed"
-}
-
-java_prepare() {
-	# someone got it all wrong (set/unset vs. bool)
-	sed -i -e 's|<property name="include_latex" value="false"/>||' plugins/build.xml || die
-
-	# disable dmg build on Mac OS X
-	sed -i -e 's:<antcall target="dist_\(macos\|icon\)"/>::p' 'build.xml' || die
-
-	java-ant_remove-taskdefs --name jarbundler # macOS only
-
-	use groovy || rm plugins/build_scripting.xml || die
-	use latex || rm plugins/build_latex.xml || die
-	use pdf || use svg || rm plugins/build_svg.xml || die
-
-	rm -v $(find "${WORKDIR}" -name '*.jar' -o -name '*.zip') || die
-}
-
-src_configure() {
-	local build_files=( $(find "${S}" -name 'build*.xml') )
-	JAVA_PKG_BSFIX_NAME="${build_files[@]##*/}"
-	JAVA_ANT_REWRITE_CLASSPATH="yes"
-	java-ant-2_src_configure
-}
-
-src_compile() {
-	local svg_deps svg_build_deps
-	if use pdf || use svg; then
-		svg_deps="batik-1.7,fop"
-		svg_build_deps=":$(java-pkg_getjars --build-only avalon-framework-4.2)"
-	fi
-	EANT_GENTOO_CLASSPATH="
-		jgoodies-forms,jibx,javahelp,simplyhtml
-		$(usex groovy groovy '')
-		$(usex latex hoteqn '')
-		${svg_deps}"
-	EANT_GENTOO_CLASSPATH_EXTRA="lib/bindings.jar${svg_build_deps}"
-	EANT_BUILD_TARGET="dist"
-	EANT_DOC_TARGET="doc"
-	EANT_ANT_TASKS="jibx"
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	cd "${WORKDIR}/bin/dist"
-	local dest="/usr/share/${PN}/"
-
-	java-pkg_dojar lib/*.jar
-
-	if use doc; then
-		java-pkg_dojavadoc doc/javadoc
-		rm -r doc/javadoc
-	fi
-
-	insinto "${dest}"
-	doins -r accessories browser doc plugins patterns.xml
-
-	# register plugins for java-dep-check
-	local plugins="help"
-	use groovy && plugins+=" script"
-	use latex && plugins+=" latex"
-	if use pdf || use svg; then
-		plugins+=" svg"
-	fi
-	local plugin
-	for plugin in ${plugins}; do
-		java-pkg_regjar "${ED}"${dest}/plugins/${plugin}/*jar
-	done
-
-	java-pkg_dolauncher ${PN} --java_args "-Dfreemind.base.dir=${EPREFIX}${dest}" \
-		--pwd "${EPREFIX}${dest}" --main freemind.main.FreeMindStarter
-
-	newicon "${S}/images/FreeMindWindowIcon.png" freemind.png
-
-	make_desktop_entry freemind Freemind freemind Utility
-}
diff --git a/app-misc/freemind/freemind-1.0.0-r1.ebuild b/app-misc/freemind/freemind-1.0.0-r1.ebuild
deleted file mode 100644
index 8af34bf2a8ba..000000000000
--- a/app-misc/freemind/freemind-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-1.0.0-r1.ebuild,v 1.5 2014/08/13 09:33:50 ago Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Mind-mapping software written in Java"
-HOMEPAGE="http://freemind.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="groovy latex pdf svg"
-
-COMMON_DEP="
-	dev-java/javahelp:0
-	dev-java/jgoodies-forms:0
-	dev-java/jibx:0
-	dev-java/jortho:0
-	>=dev-java/simplyhtml-0.13.1:0
-	groovy? ( dev-java/groovy )
-	latex? ( dev-java/hoteqn:0 )
-	pdf? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 )
-	svg? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 )"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.4
-	pdf? ( dev-java/avalon-framework:4.2 )
-	svg? ( dev-java/avalon-framework:4.2 )"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.4"
-
-S="${WORKDIR}/${PN}"
-
-java_prepare() {
-	chmod +x check_for_duplicate_resources.sh || die
-
-	# someone got it all wrong (set/unset vs. bool)
-	sed -i -e 's|<property name="include_latex" value="false"/>||' plugins/build.xml || die
-
-	# disable dmg build on Mac OS X
-	sed -i -e 's:<antcall target="dist_\(macos\|icon\)"/>::p' 'build.xml' || die
-
-	use groovy || rm plugins/build_scripting.xml || die
-	use latex || rm plugins/build_latex.xml || die
-	use pdf || use svg || rm plugins/build_svg.xml || die
-	# not compatible with releases of jmapviewer
-	rm plugins/build_map.xml || die
-
-	rm -v $(find "${WORKDIR}" -name '*.jar' -o -name '*.zip') || die
-}
-
-src_configure() {
-	local build_files=( $(find "${S}" -name 'build*.xml') )
-	JAVA_PKG_BSFIX_NAME="${build_files[@]##*/}"
-	JAVA_ANT_REWRITE_CLASSPATH="yes"
-	JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-	JAVA_ANT_ENCODING="utf-8"
-	java-ant-2_src_configure
-}
-
-src_compile() {
-	local svg_deps svg_build_deps
-	if use pdf || use svg; then
-		svg_deps="batik-1.7,fop"
-		svg_build_deps=":$(java-pkg_getjars --build-only avalon-framework-4.2)"
-	fi
-	EANT_GENTOO_CLASSPATH="
-		jgoodies-forms,jibx,javahelp,jortho,simplyhtml
-		$(usex groovy groovy '')
-		$(usex latex hoteqn '')
-		${svg_deps}"
-	EANT_GENTOO_CLASSPATH_EXTRA="lib/bindings.jar${svg_build_deps}"
-	EANT_BUILD_TARGET="dist"
-	EANT_DOC_TARGET="doc"
-	EANT_ANT_TASKS="jibx"
-	java-pkg-2_src_compile
-}
-
-src_install() {
-	cd "${WORKDIR}"/bin/dist || die
-	local dest="/usr/share/${PN}/"
-
-	java-pkg_dojar lib/*.jar
-
-	if use doc; then
-		java-pkg_dojavadoc doc/javadoc
-		rm -r doc/javadoc
-	fi
-
-	insinto "${dest}"
-	doins -r accessories browser doc plugins patterns.xml
-
-	# register plugins for java-dep-check
-	local plugins="help"
-	use groovy && plugins+=" script"
-	use latex && plugins+=" latex"
-	if use pdf || use svg; then
-		plugins+=" svg"
-	fi
-	local plugin
-	for plugin in ${plugins}; do
-		java-pkg_regjar "${ED}"${dest}/plugins/${plugin}/*jar
-	done
-
-	java-pkg_dolauncher ${PN} --java_args "-Dfreemind.base.dir=${EPREFIX}${dest}" \
-		--pwd "${EPREFIX}${dest}" --main freemind.main.FreeMindStarter
-
-	newicon "${S}/images/FreeMindWindowIcon.png" freemind.png
-
-	make_desktop_entry freemind Freemind freemind Utility
-}
diff --git a/app-misc/freemind/freemind-1.0.1.ebuild b/app-misc/freemind/freemind-1.0.1-r1.ebuild
similarity index 89%
rename from app-misc/freemind/freemind-1.0.1.ebuild
rename to app-misc/freemind/freemind-1.0.1-r1.ebuild
index ffd1ad573030..e3094270f97d 100644
--- a/app-misc/freemind/freemind-1.0.1.ebuild
+++ b/app-misc/freemind/freemind-1.0.1-r1.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-misc/freemind/freemind-1.0.1.ebuild,v 1.1 2014/08/03 09:49:07 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/freemind/freemind-1.0.1-r1.ebuild,v 1.3 2015/06/27 17:53:31 ago Exp $
 
 EAPI="5"
 
@@ -14,10 +14,10 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="groovy latex pdf svg"
 
-COMMON_DEP="
+CDEPEND="
 	dev-java/javahelp:0
 	dev-java/jgoodies-forms:0
 	dev-java/jibx:0
@@ -25,14 +25,20 @@ COMMON_DEP="
 	>=dev-java/simplyhtml-0.13.1:0
 	groovy? ( dev-java/groovy )
 	latex? ( dev-java/hoteqn:0 )
-	pdf? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 )
-	svg? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 )"
-DEPEND="${COMMON_DEP}
-	>=virtual/jdk-1.4
+	pdf? (
+		dev-java/batik:1.8
+		dev-java/fop:2
+	)
+	svg? (
+		dev-java/batik:1.8
+		dev-java/fop:2
+	)"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
 	pdf? ( dev-java/avalon-framework:4.2 )
 	svg? ( dev-java/avalon-framework:4.2 )"
-RDEPEND="${COMMON_DEP}
-	>=virtual/jre-1.4"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
 
 S="${WORKDIR}/${PN}"
 
@@ -66,7 +72,7 @@ src_configure() {
 src_compile() {
 	local svg_deps svg_build_deps
 	if use pdf || use svg; then
-		svg_deps="batik-1.7,fop"
+		svg_deps="batik-1.8,fop"
 		svg_build_deps=":$(java-pkg_getjars --build-only avalon-framework-4.2)"
 	fi
 	EANT_GENTOO_CLASSPATH="
diff --git a/app-misc/gnuit/gnuit-4.9.5-r2.ebuild b/app-misc/gnuit/gnuit-4.9.5-r2.ebuild
index e87cefda87ed..b876dd2b02e5 100644
--- a/app-misc/gnuit/gnuit-4.9.5-r2.ebuild
+++ b/app-misc/gnuit/gnuit-4.9.5-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-misc/gnuit/gnuit-4.9.5-r2.ebuild,v 1.1 2015/06/24 10:03:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnuit/gnuit-4.9.5-r2.ebuild,v 1.3 2015/06/27 14:17:00 zlogene Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 FDL-1.3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/app-misc/ranger/Manifest b/app-misc/ranger/Manifest
index a226ca3d8d67..2e8fbe7e737b 100644
--- a/app-misc/ranger/Manifest
+++ b/app-misc/ranger/Manifest
@@ -1,3 +1 @@
-DIST ranger-1.6.1.tar.gz 168967 SHA256 ccb230a5d2d71ca11612b5af1ca515f9d490b51b1546678828e306252677db5e SHA512 7c9179c0ba000a01dc6fe97ed39332345269416d3156825e846019082bf94e9902cb1716576a94b87e106a2c2ccbcd3521050d3a7f13332e2880d5c8b99ee2b6 WHIRLPOOL 03ebf4f1ff7e437019e0b7ba5d3e658139d9a8fed754e2436e1b1c0b813eccbb474a31c4217619c6cee2acf1042ce306b85c0ddb6f5becec389f27877dded362
-DIST ranger-1.7.0.tar.gz 245647 SHA256 7d12f6b89cfd1a831fa4ecf5798caee525fbdca8402ac1b9a5e2b32f66b8d418 SHA512 d48e65d265c2795204cc11ec0dafea3924f714b8824e9d91967ec4f087c069c87df0b72f7650123bba45cde56a8b5179ccf806339bf3834535a58421a8aafe2e WHIRLPOOL a492001486f241ba9f90dcaeabdc4c53c05b221928cad97b73412660ebb8b6f190394fdd67a49827b4f497f3f4651263614ae8aea872c4bd6166e14ad4b7bd67
 DIST ranger-1.7.1.tar.gz 266089 SHA256 f8b06135165142508ae7ec22ab2c95f6e51b4018c645d11226086d4c45b7df86 SHA512 646e2e4286813085820f35d5dfb6528ed1005e833db92d0521164c067aed2bdf56f4d3acc7ef77388e54a7f7191608e390b65305f62fed39b4109e3fff27f410 WHIRLPOOL 4b9dae8bc99ab4a310d0d71e7793b2cdd21e4146f389b02f8a1496f8f1bae4015a31e9d4de993720297139ac7a377d6673f4eea1250d802298c076769fedfc18
diff --git a/app-misc/ranger/ranger-1.6.1.ebuild b/app-misc/ranger/ranger-1.6.1.ebuild
deleted file mode 100644
index fa0459ca5368..000000000000
--- a/app-misc/ranger/ranger-1.6.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-1.6.1.ebuild,v 1.6 2014/11/02 00:55:09 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.nongnu.org/ranger.git"
-	inherit git-r3
-else
-	SRC_URI="http://nongnu.org/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="A vim-inspired file manager for the console"
-HOMEPAGE="http://ranger.nongnu.org/"
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="virtual/pager"
-
-PATCHES=( "${FILESDIR}"/${P}-w3mimgdisplay.patch )
-
-src_prepare() {
-	sed -i "s|share/doc/ranger|share/doc/${PF}|" setup.py doc/ranger.1 || die
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Ranger has many optional dependencies to support enhanced file previews."
-		elog "See the README or homepage for more details."
-	fi
-}
diff --git a/app-misc/ranger/ranger-1.7.0.ebuild b/app-misc/ranger/ranger-1.7.0.ebuild
deleted file mode 100644
index fe4aed55616f..000000000000
--- a/app-misc/ranger/ranger-1.7.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-1.7.0.ebuild,v 1.1 2015/04/26 01:54:42 radhermit Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.savannah.nongnu.org/ranger.git"
-	inherit git-r3
-else
-	SRC_URI="http://nongnu.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A vim-inspired file manager for the console"
-HOMEPAGE="http://ranger.nongnu.org/"
-LICENSE="GPL-3"
-SLOT="0"
-
-RDEPEND="virtual/pager"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.6.1-w3mimgdisplay.patch )
-
-src_prepare() {
-	sed -i "s|share/doc/ranger|share/doc/${PF}|" setup.py doc/ranger.1 || die
-	distutils-r1_src_prepare
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Ranger has many optional dependencies to support enhanced file previews."
-		elog "See the README or homepage for more details."
-	fi
-}
diff --git a/app-misc/ranger/ranger-1.7.1.ebuild b/app-misc/ranger/ranger-1.7.1.ebuild
index d47083457786..773e32edd612 100644
--- a/app-misc/ranger/ranger-1.7.1.ebuild
+++ b/app-misc/ranger/ranger-1.7.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-misc/ranger/ranger-1.7.1.ebuild,v 1.1 2015/05/16 19:40:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ranger/ranger-1.7.1.ebuild,v 1.3 2015/06/27 01:55:32 radhermit Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="http://nongnu.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~ppc x86"
 fi
 
 DESCRIPTION="A vim-inspired file manager for the console"
diff --git a/app-misc/tmux/tmux-1.9a.ebuild b/app-misc/tmux/tmux-1.9a.ebuild
index 450002b1577c..2379ee6550be 100644
--- a/app-misc/tmux/tmux-1.9a.ebuild
+++ b/app-misc/tmux/tmux-1.9a.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/tmux/tmux-1.9a.ebuild,v 1.13 2015/01/05 08:41:22 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.9a.ebuild,v 1.14 2015/06/27 01:52:25 radhermit Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=true
@@ -8,8 +8,8 @@ AUTOTOOLS_AUTORECONF=true
 inherit autotools-utils bash-completion-r1 flag-o-matic
 
 DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="http://tmux.sourceforge.net"
-SRC_URI="mirror://sourceforge/tmux/${P}.tar.gz"
+HOMEPAGE="http://tmux.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
diff --git a/app-misc/tmux/tmux-2.0.ebuild b/app-misc/tmux/tmux-2.0.ebuild
index 1a4b5e86cc2a..e92f66507bdb 100644
--- a/app-misc/tmux/tmux-2.0.ebuild
+++ b/app-misc/tmux/tmux-2.0.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-2.0.ebuild,v 1.1 2015/05/10 07:09:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-2.0.ebuild,v 1.2 2015/06/27 01:52:25 radhermit Exp $
 
 EAPI=5
-
 AUTOTOOLS_AUTORECONF=true
 
 inherit autotools-utils bash-completion-r1 flag-o-matic
 
 DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="http://tmux.sourceforge.net"
-SRC_URI="mirror://sourceforge/tmux/${P}.tar.gz"
+HOMEPAGE="http://tmux.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 82f55f626f06..78a281509714 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-9999.ebuild,v 1.14 2015/05/10 07:09:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-9999.ebuild,v 1.15 2015/06/27 01:52:25 radhermit Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=true
 
 inherit autotools-utils git-r3 bash-completion-r1 flag-o-matic
 
+EGIT_REPO_URI="https://github.com/tmux/tmux.git"
+
 DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="http://tmux.sourceforge.net"
+HOMEPAGE="http://tmux.github.io/"
 SRC_URI=""
-EGIT_REPO_URI="git://git.code.sf.net/p/tmux/tmux-code"
 
 LICENSE="ISC"
 SLOT="0"
diff --git a/app-mobilephone/obexftp/obexftp-0.23-r2.ebuild b/app-mobilephone/obexftp/obexftp-0.23-r2.ebuild
index 4035ff19ea90..3952c4bd7310 100644
--- a/app-mobilephone/obexftp/obexftp-0.23-r2.ebuild
+++ b/app-mobilephone/obexftp/obexftp-0.23-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-mobilephone/obexftp/obexftp-0.23-r2.ebuild,v 1.9 2015/04/08 07:30:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.23-r2.ebuild,v 1.10 2015/06/27 11:12:21 dilfridge Exp $
 
 EAPI="5"
 
@@ -20,7 +20,7 @@ IUSE="bluetooth debug perl python ruby tcl"
 
 RDEPEND="dev-libs/openobex
 	bluetooth? ( net-wireless/bluez )
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	ruby? ( dev-lang/ruby:1.9 )
 	tcl? ( dev-lang/tcl:0= )
 "
diff --git a/app-mobilephone/obexftp/obexftp-0.24.ebuild b/app-mobilephone/obexftp/obexftp-0.24.ebuild
index d37f57779535..3dd24aac7be3 100644
--- a/app-mobilephone/obexftp/obexftp-0.24.ebuild
+++ b/app-mobilephone/obexftp/obexftp-0.24.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-mobilephone/obexftp/obexftp-0.24.ebuild,v 1.5 2015/04/26 17:53:07 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/obexftp/obexftp-0.24.ebuild,v 1.6 2015/06/27 11:12:21 dilfridge Exp $
 
 EAPI=5
 
@@ -19,7 +19,7 @@ IUSE="bluetooth perl python ruby tcl"
 RDEPEND="
 	>=dev-libs/openobex-1.7
 	bluetooth? ( net-wireless/bluez )
-	perl? ( dev-lang/perl )
+	perl? ( dev-lang/perl:= )
 	python? ( ${PYTHON_DEPS} )
 	ruby? ( || ( dev-lang/ruby:2.0 dev-lang/ruby:1.9 ) )
 	tcl? ( dev-lang/tcl:0= )
diff --git a/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
new file mode 100644
index 000000000000..291873229918
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild,v 1.1 2015/06/26 22:30:31 johu Exp $
+
+EAPI=5
+
+if [[ $PV = *9999* ]]; then
+	scm_eclass=git-r3
+	EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+	S="${WORKDIR}/${P/-server/}"
+fi
+
+inherit cmake-utils ${scm_eclass}
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+mysql postgres +qt4 qt5 soprano sqlite test"
+
+REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
+
+CDEPEND="
+	dev-libs/boost:=
+	x11-misc/shared-mime-info
+	qt4? (
+		>=dev-qt/qtcore-4.8.5:4
+		>=dev-qt/qtdbus-4.8.5:4
+		>=dev-qt/qtgui-4.8.5:4
+		>=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
+		>=dev-qt/qttest-4.8.5:4
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsql:5[mysql?,postgres?]
+		dev-qt/qttest:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		soprano? ( dev-libs/soprano[-qt4,qt5] )
+	)
+	soprano? ( dev-libs/soprano )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	>=dev-util/automoc-0.9.88
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${CDEPEND}
+	postgres? ( dev-db/postgresql[server] )
+"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-mysql56-crash.patch" )
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		[[ $(gcc-major-version) -lt 4 ]] || \
+			( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) \
+			&& die "Sorry, but gcc-4.6 and earlier won't work (see bug #520102)."
+	fi
+}
+
+pkg_setup() {
+	# Set default storage backend in order: MySQL, SQLite PostgreSQL
+	# reverse driver check to keep the order
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	# Notify about MySQL is recommend by upstream
+	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+		ewarn
+		ewarn "We strongly recommend you change your Akonadi database backend to MySQL in your"
+		ewarn "user configuration. This is the backend recommended by KDE upstream."
+		ewarn "In particular, kde-base/kmail-4.10 does not work properly with the sqlite"
+		ewarn "backend anymore."
+		ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+		ewarn
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
+		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use_with soprano)
+		$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
+		$(cmake-utils_use qt5 QT5_BUILD)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	export $(dbus-launch)
+	cmake-utils_src_test
+}
+
+src_install() {
+	# Who knows, maybe it accidentally fixes our permission issues
+	cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+	insinto /usr/share/config/akonadi
+	doins "${T}"/akonadiserverrc
+
+	cmake-utils_src_install
+}
+
+pkg_postinst() {
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+	elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are: ${AVAILABLE}"
+}
diff --git a/app-office/akonadi-server/akonadi-server-1.13.0.ebuild b/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
index 08ca8a454911..c8a7fac8c6b7 100644
--- a/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.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/app-office/akonadi-server/akonadi-server-1.13.0.ebuild,v 1.9 2014/12/28 14:53:20 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.13.0.ebuild,v 1.10 2015/06/26 22:30:31 johu Exp $
 
 EAPI=5
 
diff --git a/app-office/akonadi-server/files/akonadi-server-1.13.0-mysql56-crash.patch b/app-office/akonadi-server/files/akonadi-server-1.13.0-mysql56-crash.patch
new file mode 100644
index 000000000000..204961832767
--- /dev/null
+++ b/app-office/akonadi-server/files/akonadi-server-1.13.0-mysql56-crash.patch
@@ -0,0 +1,20 @@
+diff -aruN akonadi-1.13.0.old/server/src/storage/dbconfigmysql.cpp akonadi-1.13.0/server/src/storage/dbconfigmysql.cpp
+--- akonadi-1.13.0.old/server/src/storage/dbconfigmysql.cpp	2014-08-10 06:38:58.000000000 -0400
++++ akonadi-1.13.0/server/src/storage/dbconfigmysql.cpp	2015-01-08 15:08:36.906134212 -0500
+@@ -76,6 +76,7 @@
+       << QLatin1String( "/usr/local/sbin" )
+       << QLatin1String( "/usr/local/libexec" )
+       << QLatin1String( "/usr/libexec" )
++      << QLatin1String( "/usr/share/mysql/scripts" )
+       << QLatin1String( "/opt/mysql/libexec" )
+       << QLatin1String( "/opt/local/lib/mysql5/bin" )
+       << QLatin1String( "/opt/mysql/sbin" );
+@@ -278,7 +279,7 @@
+   // first run, some MySQL versions need a mysql_install_db run for that
+   const QString confFile = XdgBaseDirs::findResourceFile( "config", QLatin1String( "akonadi/mysql-global.conf" ) );
+   if ( QDir( dataDir ).entryList( QDir::NoDotAndDotDot | QDir::AllEntries ).isEmpty() && !mMysqlInstallDbPath.isEmpty() ) {
+-    const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1" ).arg( confFile ) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir );
++    const QStringList arguments = QStringList() << QString::fromLatin1( "--force" ) << QString::fromLatin1( "--defaults-file=%1" ).arg( confFile ) << QString::fromLatin1( "--datadir=%1/" ).arg( dataDir ) << QString::fromLatin1( "--basedir=/usr" ) ;
+     QProcess::execute( mMysqlInstallDbPath, arguments );
+   }
+ 
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index bea7dac46d07..233c341c00ba 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,2 +1,3 @@
 DIST skrooge-1.10.0.tar.bz2 12813255 SHA256 aae15e7abf91a7fc217247d3ae5e672f4215a9090f12389cddab68fe5a175c67 SHA512 ff6137208aaacd01ee4f5a9897f69da1c40b168e9711479d0cc06c8e2f0880b5345d5f452ed5aaf53034bf773d06b7d8810166d751f10e9e90a1204429e0369a WHIRLPOOL 4f10e1f6825325f37e8154fb940df2cbea4b813c2c85a11520778b73d8d44435ccb87687139daa85a2a9d2df56c4beee777404f786df5815eef6ac6e0ed46598
 DIST skrooge-1.12.0.tar.bz2 12993707 SHA256 2407e6e7efa7a0f759c91660a419de2e5ba66f2675cfbee300d12736ef928c1d SHA512 8e913e87692374ecd941ea5f52b64f853942f86e8a5b2dee20d978745eaef69d278505dce5ca6a673cf596230e3946ea85e8a80d1123908a6d9a0a59ae9f67c6 WHIRLPOOL 99e313b72479fc065e1b39890780e0119985c17d03d6ce0b51bf58bd92ade7bde29cfbe2c6e9f588a955b6006c2e91c1ec1ab18ccb8170b035bde2b46aaf7282
+DIST skrooge-2.0.0.tar.xz 10365184 SHA256 50da4dde01b85b2b0ba16902a05664910d4f2dbaa828370ee44c9f89e2efd6b5 SHA512 b3c5ff36e858fd2eef39be0cfb4041e6b16c8aa4562b5fea121e21760a4088f722da789ecdeb5d317446b114ae55dea100970e9c98ae4fe7cac716db674c9a96 WHIRLPOOL 25983d39016b30c73e974b440c1439915b1770e6d041b675efc2eb736ee0cf37999fe2f19028f699f2317714e91da17cb02e9a0d8338c02ac5abbfaa3c09854c
diff --git a/app-office/skrooge/metadata.xml b/app-office/skrooge/metadata.xml
index a23f444b67d6..65184d300c72 100644
--- a/app-office/skrooge/metadata.xml
+++ b/app-office/skrooge/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
+	<use>
+		<flag name="activities">Enable kactivities support</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-office/skrooge/skrooge-2.0.0.ebuild b/app-office/skrooge/skrooge-2.0.0.ebuild
new file mode 100644
index 000000000000..c32b670f835d
--- /dev/null
+++ b/app-office/skrooge/skrooge-2.0.0.ebuild
@@ -0,0 +1,92 @@
+# 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-2.0.0.ebuild,v 1.1 2015/06/27 22:12:53 johu Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Personal finances manager, aiming at being simple and intuitive"
+HOMEPAGE="http://www.skrooge.org/"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+IUSE="activities ofx"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep kdesignerplugin)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep krunner)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	app-crypt/qca:2[qt5]
+	dev-db/sqlite:3
+	dev-libs/grantlee:5
+	dev-libs/libxslt
+	dev-libs/qjson
+	dev-qt/designer:5
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	x11-misc/shared-mime-info
+	activities? ( $(add_frameworks_dep kactivities) )
+	ofx? ( >=dev-libs/libofx-0.9.1 )
+	!app-office/skrooge:4
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+
+# upstream does not ship tests in releases
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	RESTRICT="test"
+fi
+
+DOCS=( AUTHORS CHANGELOG README TODO )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake-utils_use_find_package ofx LibOfx)
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	local mycmakeargs=(
+		-DSKG_BUILD_TEST=ON
+	)
+	kde5_src_test
+}
diff --git a/app-shells/bash-completion/bash-completion-2.1_p20141224.ebuild b/app-shells/bash-completion/bash-completion-2.1_p20141224.ebuild
index 4d973ee7b7a1..64260e027abc 100644
--- a/app-shells/bash-completion/bash-completion-2.1_p20141224.ebuild
+++ b/app-shells/bash-completion/bash-completion-2.1_p20141224.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-shells/bash-completion/bash-completion-2.1_p20141224.ebuild,v 1.5 2015/06/07 10:58:37 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/bash-completion/bash-completion-2.1_p20141224.ebuild,v 1.6 2015/06/28 10:02:49 zlogene Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://dev.gentoo.org/~mgorny/dist/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
 RDEPEND=">=app-shells/bash-4.3_p30-r1
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.ebuild
index d7551ee16f80..a3f722120776 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.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-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.ebuild,v 1.3 2015/06/07 10:58:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/gentoo-bashcomp/gentoo-bashcomp-20140911.ebuild,v 1.4 2015/06/28 10:02:22 zlogene Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris"
 IUSE=""
 
 src_install() {
diff --git a/app-text/jabref/metadata.xml b/app-text/jabref/metadata.xml
index 68b32ecaeed7..1e25d5f01ac8 100644
--- a/app-text/jabref/metadata.xml
+++ b/app-text/jabref/metadata.xml
@@ -5,6 +5,7 @@
 	<herd>sci</herd>
 	<maintainer>
 		<email>nicolasbock@gentoo.org</email>
+		<name>Nicolas Bock</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jabref</remote-id>
diff --git a/app-text/mupdf/mupdf-1.5-r1.ebuild b/app-text/mupdf/mupdf-1.5-r1.ebuild
index 3e3b1fde0c9f..2e4c14af59de 100644
--- a/app-text/mupdf/mupdf-1.5-r1.ebuild
+++ b/app-text/mupdf/mupdf-1.5-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-text/mupdf/mupdf-1.5-r1.ebuild,v 1.3 2015/02/26 13:53:42 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.5-r1.ebuild,v 1.4 2015/06/27 12:34:43 maekke Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=b2f096de23e5341fbb
 LICENSE="AGPL-3"
 MY_SOVER=1.5
 SLOT="0/${MY_SOVER}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X vanilla +curl +openssl static static-libs"
 
 LIB_DEPEND="dev-libs/openssl[static-libs?]
diff --git a/dev-cpp/sparsehash/Manifest b/dev-cpp/sparsehash/Manifest
index fba46336e4b1..a2c2234f3840 100644
--- a/dev-cpp/sparsehash/Manifest
+++ b/dev-cpp/sparsehash/Manifest
@@ -1,4 +1,2 @@
-DIST sparsehash-1.1.tar.gz 270585 SHA256 1d84e4a7adebcbf75b7c628c3b7eaadf9c2b5dcb68557fc64cf01d3ef2fb3a05 SHA512 00975fbb5161ddda629ba82ca5b431710ec1e5312202acd87e8c37a97c8f432276e68f35b701c1465800d62f69f493b7a5ef89a5440055f9a6f593ee07bd43bd WHIRLPOOL 2a518ca239d55b9fe69ca3f47af3155d94927f89fb9c5055c02aa9c4b0139d1c8712825991d9285d06205729cabdfa4e20238d4466df390f12893518219914e4
 DIST sparsehash-1.10.tar.gz 289819 SHA256 5a57b77633aab1e59827e51cf6247c4ac521713d45f1764ddba60353cbc9677a SHA512 ecc01e755885b8da5927f4f56c95c02ce9a43e5c0280cdc1cdfa812f787396646925c0f602a35decdf94144e8d2f3ac31b80f5ed98b70ccca607a29bb11f8a35 WHIRLPOOL 643e27499b1981faa7dc8864886c736a5265d78221edaed0fb6bd73eaf943433d5fbe5fe26ec2e52451651e19ce869a6ad08c22d7fb3d71b6cc7bf5866fd3653
-DIST sparsehash-1.5.2.tar.gz 292715 SHA256 a885133a2bc2fef50a2393d494972645e0324a1ec4c8c0332deafcbef9a52dcc SHA512 83efcb38af7433071bd2b4aea4ccc270b1d802783ae08da39a45d89c033123be34cd2c1562da382b339393fdf3ad9f84668e531d270de746102a7141c26443e6 WHIRLPOOL 35c5d366c9636c73b91501f6313a3371892c95d9d330ca3e46bfd9ee7b8e61c4e4822ae6f709d85d83f9478a507eca417c55ef81573617b51a5c19861a874ac4
 DIST sparsehash-2.0.2.tar.gz 340514 SHA256 2ed639a7155607c097c2029af5f4287296595080b2e5dd2e2ebd9bbb7450b87c SHA512 27d823551bc8364dd3c10f071e51bab55d2bbe9cf74ddb8337d118475aa7fdd38ae07dbb7dbd721c1350830325cadccdadf127f9996f26387e412e108edba3a1 WHIRLPOOL 87d31528bfd7a177c7be3be2bcddf1ba52bcc8791b8b2162cc1902e4cf02695c99b9a6b70fbcfd85d9e03456931bd72fc67b47cad79d0182bd1d4f5eb11e6f0b
diff --git a/dev-cpp/sparsehash/sparsehash-1.1.ebuild b/dev-cpp/sparsehash/sparsehash-1.1.ebuild
deleted file mode 100644
index 03955a62d4f8..000000000000
--- a/dev-cpp/sparsehash/sparsehash-1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sparsehash/sparsehash-1.1.ebuild,v 1.2 2011/04/28 13:33:14 jlec Exp $
-
-DESCRIPTION="An extremely memory-efficient hash_map implementation"
-HOMEPAGE="http://code.google.com/p/google-sparsehash/"
-SRC_URI="http://google-sparsehash.googlecode.com/files/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Installs just every piece
-	rm -rf "${D}/usr/share/doc"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	dohtml doc/*
-}
diff --git a/dev-cpp/sparsehash/sparsehash-1.5.2.ebuild b/dev-cpp/sparsehash/sparsehash-1.5.2.ebuild
deleted file mode 100644
index f1c9cdd2f3a5..000000000000
--- a/dev-cpp/sparsehash/sparsehash-1.5.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/sparsehash/sparsehash-1.5.2.ebuild,v 1.4 2011/04/28 13:33:14 jlec Exp $
-
-DESCRIPTION="An extremely memory-efficient hash_map implementation"
-HOMEPAGE="http://code.google.com/p/google-sparsehash/"
-SRC_URI="http://google-sparsehash.googlecode.com/files/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Installs just every piece
-	rm -rf "${D}/usr/share/doc"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	dohtml doc/*
-}
diff --git a/dev-cpp/tbb/tbb-4.3.20141023.ebuild b/dev-cpp/tbb/tbb-4.3.20141023.ebuild
index d0ade737666d..365b380a15bd 100644
--- a/dev-cpp/tbb/tbb-4.3.20141023.ebuild
+++ b/dev-cpp/tbb/tbb-4.3.20141023.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-cpp/tbb/tbb-4.3.20141023.ebuild,v 1.2 2015/05/05 08:28:02 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/tbb/tbb-4.3.20141023.ebuild,v 1.3 2015/06/26 14:29:39 ago Exp $
 
 EAPI=5
 inherit eutils flag-o-matic multilib versionator toolchain-funcs
@@ -16,7 +16,7 @@ SRC_URI="http://threadingbuildingblocks.org/sites/default/files/software_release
 LICENSE="GPL-2-with-exceptions"
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug doc examples"
 
 DEPEND=""
diff --git a/dev-db/ctdb/Manifest b/dev-db/ctdb/Manifest
index 27e5c2865321..1a26634710b2 100644
--- a/dev-db/ctdb/Manifest
+++ b/dev-db/ctdb/Manifest
@@ -1,4 +1 @@
-DIST ctdb-1.0.114-1.src.rpm 836695 SHA256 66c3eb72f6ba2c9787484d8796e5fb59083a1b1bf45c6c96c32c31952d4ad1ce SHA512 b24cabe42b89e22c61317870e6730c1a4fe6dfae338e256a940266eba94b043e7972211189f60b97c13e42415dc9ffe28038e005bfaf13a37e24eb033f924b95 WHIRLPOOL 75858bfb8e685adcbe66e15fa3d1062cac1dfcc244b2bee3102ea3ac15c718c7818f6cdab44b28ee3a6e3ed1280a259e1df62dd0b9f0e01d8ef69fa59c7716a4
-DIST ctdb-1.0.73.tgz 627095 SHA256 348779e2414c364cb84b6bb2659fa50d0a001315a2ca82ed944cce7f0851c14d SHA512 db3b0ffa1ac6c408e6aa5fc07cbb212945036f8beb396cfbc6d5de22126734981bdb2ec8966377c15ef7962d685aeb9a243d2426330d664b5a17078b66c75e30 WHIRLPOOL ed2f59b27348684cc63f2d564babd272f43a8c37a251b7097192006a377305d4a012c64893a3505f048ef63f3765b92093a837e6894b4d2f87fb9106be620f18
-DIST ctdb-1.0.88.tgz 681220 SHA256 d9b0cc07b83334caeaf7852162fb54861bb79577682c2e6936770572ede68e32 SHA512 2cf2f11496b68a1f877aeddc4ea6098132bad182995e06da3115d2b76853e085d78fc6f976365f670e9a451fb6591e65a63a5f737e5aa8840949fe07017306ac WHIRLPOOL bdccd83aad30f8432bcc576c533954d54a1b6023067c404b7f4c2684f99e9a31f7d65ff62059765364adbd766163133a2c82651a75a7cf9bc91f4aae0bef04a0
 DIST ctdb-1.13.tar.xz 736004 SHA256 c43693877cbc7d047d8b11b01a101bee69df6a871ab397214cc68d8f6f8c98c7 SHA512 653e1d5c29962810353d6b8c5867d07bef17dd5bf431f7304793f13712bb92379fb1b05b6e461279b08e0a1c9d87951f57fb1e2c35f85392b99baadf7d232ece WHIRLPOOL 9323de35b038a920ed6d5ed3be379c7c2ec93814f0f8c4f304de36e2512f58f7a62578ecd257d4fbe4e856c6d0b196fae88e7fbf673e47bbfd2acf0f2ac13b6b
diff --git a/dev-db/ctdb/ctdb-1.0.114_p1.ebuild b/dev-db/ctdb/ctdb-1.0.114_p1.ebuild
deleted file mode 100644
index 5f65245207eb..000000000000
--- a/dev-db/ctdb/ctdb-1.0.114_p1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-1.0.114_p1.ebuild,v 1.12 2014/08/10 19:58:22 slyfox Exp $
-
-EAPI="2"
-
-inherit autotools rpm eutils
-
-DESCRIPTION="A cluster implementation of the TDB database used to store temporary data"
-HOMEPAGE="http://ctdb.samba.org/"
-SRC_URI="http://ctdb.samba.org/packages/redhat/RHEL5/${P/_p/-}.src.rpm
-	http://ctdb.samba.org/packages/redhat/RHEL5/old/${P/_p/-}.src.rpm"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="test"
-
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/iproute2
-		sys-process/procps )"
-
-S="${WORKDIR}/${P/_p*}"
-
-src_prepare() {
-	AT_M4DIR="-I ${S}/lib/replace -I ${S}/lib/talloc -I ${S}/lib/tdb -I ${S}/lib/popt -I ${S}/lib/events"
-	autotools_run_tool autoheader ${AT_M4DIR} || die "running autoheader failed"
-	eautoconf ${AT_M4DIR}
-
-	# fix tests
-	sed -i \
-		-e "s|/tmp|${T}|" \
-		tests/simple/54_ctdb_transaction_recovery.sh || die "sed failed"
-
-	# the following tests assume that the setup was indeed able to add new ip
-	# addresses to the lo device (11,16), resp make assumptions about the
-	# performance (52)
-	rm \
-		tests/simple/{11,16,52}_*.sh || die "removing failing tests failed"
-
-	epatch \
-		"${FILESDIR}/${PN}-50.samba_gentoo.patch" \
-		"${FILESDIR}/${P}-functions.patch"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc "${D}/usr/share/doc/ctdb/README.eventscripts"
-	rm -rf "${D}/usr/share/doc/ctdb"
-
-	dohtml web/* doc/*.html
-
-	newinitd "${FILESDIR}/${PN}.initd" ctdb || die "newinitd failed"
-	newconfd "${S}/config/ctdb.sysconfig" ctdb || die "newconfd failed"
-}
-
-src_test() {
-	emake test || { pkill ctdb ; die "running tests failed" ; }
-	pkill ctdb
-}
diff --git a/dev-db/ctdb/ctdb-1.0.73.ebuild b/dev-db/ctdb/ctdb-1.0.73.ebuild
deleted file mode 100644
index c425ef0cdcd2..000000000000
--- a/dev-db/ctdb/ctdb-1.0.73.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-1.0.73.ebuild,v 1.8 2014/08/10 19:58:22 slyfox Exp $
-
-EAPI="2"
-
-inherit autotools
-
-DESCRIPTION="A cluster implementation of the TDB database used to store temporary data"
-HOMEPAGE="http://ctdb.samba.org/"
-SRC_URI="http://ctdb.samba.org/packages/redhat/RHEL5/${P}.tgz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/popt"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	AT_M4DIR="-I ${S}/lib/replace -I ${S}/lib/talloc -I ${S}/lib/tdb -I ${S}/lib/popt -I ${S}/lib/events"
-	autotools_run_tool autoheader ${AT_M4DIR} || die "running autoheader failed"
-	eautoconf ${AT_M4DIR}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc "${D}/usr/share/doc/ctdb/README.eventscripts"
-	rm -rf "${D}/usr/share/doc/ctdb"
-
-	dohtml web/* doc/*.html
-}
diff --git a/dev-db/ctdb/ctdb-1.0.88.ebuild b/dev-db/ctdb/ctdb-1.0.88.ebuild
deleted file mode 100644
index 6eaf59734f6a..000000000000
--- a/dev-db/ctdb/ctdb-1.0.88.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/dev-db/ctdb/ctdb-1.0.88.ebuild,v 1.12 2014/08/10 19:58:22 slyfox Exp $
-
-EAPI="2"
-
-inherit autotools eutils
-
-DESCRIPTION="A cluster implementation of the TDB database used to store temporary data"
-HOMEPAGE="http://ctdb.samba.org/"
-SRC_URI="http://ctdb.samba.org/packages/redhat/RHEL5/${P}.tgz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND="dev-libs/popt"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	AT_M4DIR="-I ${S}/lib/replace -I ${S}/lib/talloc -I ${S}/lib/tdb -I ${S}/lib/popt -I ${S}/lib/events"
-	autotools_run_tool autoheader ${AT_M4DIR} || die "running autoheader failed"
-	eautoconf ${AT_M4DIR}
-
-	epatch "${FILESDIR}"/${PN}-functions.patch
-	epatch "${FILESDIR}"/${PN}-50.samba_gentoo.patch
-	epatch "${FILESDIR}"/${PN}-41.httpd_gentoo.patch
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc "${D}/usr/share/doc/ctdb/README.eventscripts"
-	rm -rf "${D}/usr/share/doc/ctdb"
-
-	dohtml web/* doc/*.html
-
-	newinitd "${FILESDIR}/${PN}.initd" ctdb || die "newinitd failed"
-	newconfd "${S}/config/ctdb.sysconfig" ctdb || die "newconfd failed"
-}
diff --git a/dev-db/ctdb/ctdb-1.13.ebuild b/dev-db/ctdb/ctdb-1.13.ebuild
deleted file mode 100644
index abb3f932ad21..000000000000
--- a/dev-db/ctdb/ctdb-1.13.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-1.13.ebuild,v 1.11 2014/08/10 19:58:22 slyfox Exp $
-
-EAPI=4
-
-inherit base eutils
-
-DESCRIPTION="A cluster implementation of the TDB database used to store temporary data"
-HOMEPAGE="http://ctdb.samba.org/"
-# upstream is too sexy for releases, grab tags from:
-#    http://git.samba.org/?p=ctdb.git;a=summary
-SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND="dev-libs/popt"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ldflags.patch"
-)
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--localstatedir="${EPREFIX}/var/lib" \
-		--with-logdir="${EPREFIX}/var/log/${PN}"
-}
-
-src_install() {
-	default
-
-	dohtml web/* doc/*.html
-}
diff --git a/dev-db/drizzle/Manifest b/dev-db/drizzle/Manifest
index 9e04da10b94a..684b6fc0ca74 100644
--- a/dev-db/drizzle/Manifest
+++ b/dev-db/drizzle/Manifest
@@ -1,2 +1 @@
-DIST drizzle-7.1.33-stable.tar.gz 29203104 SHA256 12215b143f4a77ba44a7312313f1d187d598c6dd5b7eb949a7404599e827fcc0 SHA512 cb2cd9b7b1f08483a52eb80d14a051ee1b14901d63745a5faeda64f2181b6ea440573d4dd020da37930242781135dcd99d90ae130d74b53332ee5d88295e2ad1 WHIRLPOOL e62264bb6d2b2cacfa4ed238266370df2e0833a3a6d49d59e22be98f2b7c9c6bd42e43d8facce8179d46817a11d1db0b74da3e254dd8ef3a99d74eb820b047d0
 DIST drizzle-7.2.4-alpha.tar.gz 20075673 SHA256 dddc58949c28ccbdd8351b25540858235a7d98efb634e7bc98abd4f5ab034677 SHA512 1053c9b73588542b32398168fc4aae96a19479222571fb4ba35feb1fa6e99961366fc63a4141bf86bdba7f5db1960ed895b3a688789d05ee8d4bd46d0ab681cd WHIRLPOOL 4b2e97f7276eb447f27bc5b0244e31d47cba2acc0fde16d6e10dc0d47ba680885e035b9cf9dda8dff171279a76fbd24f34d2754ac1342b203d56316bb4d34233
diff --git a/dev-db/drizzle/drizzle-7.1.33.ebuild b/dev-db/drizzle/drizzle-7.1.33.ebuild
deleted file mode 100644
index 54395e53e090..000000000000
--- a/dev-db/drizzle/drizzle-7.1.33.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/drizzle/drizzle-7.1.33.ebuild,v 1.4 2014/03/01 22:26:02 mgorny Exp $
-
-EAPI=2
-
-WANT_AUTOMAKE=1.11
-
-inherit flag-o-matic libtool autotools eutils pam user versionator
-
-MY_P="${P}-stable"
-S="${WORKDIR}/${MY_P}"
-DIR_PV="$(get_version_component_range 1-2)/${PV}"
-
-DESCRIPTION="Database optimized for Cloud and Net applications"
-HOMEPAGE="http://drizzle.org"
-SRC_URI="http://launchpad.net/drizzle/${DIR_PV}/+download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug tcmalloc doc memcache curl pam gearman +md5 ldap haildb"
-
-RDEPEND="tcmalloc? ( dev-util/google-perftools )
-		sys-libs/readline
-		sys-apps/util-linux
-		dev-libs/libpcre
-		>=dev-libs/libevent-1.4
-		>=dev-libs/protobuf-2.1.0
-		gearman? ( >=sys-cluster/gearmand-0.12 )
-		pam? ( sys-libs/pam )
-		curl? ( net-misc/curl )
-		memcache? ( >=dev-libs/libmemcached-0.39 )
-		md5? ( >=dev-libs/libgcrypt-1.4.2:0 )
-		haildb? ( >=dev-db/haildb-2.3.2 )
-		>=dev-libs/boost-1.32
-		ldap? ( net-nds/openldap )
-		!dev-db/libdrizzle"
-
-DEPEND="${RDEPEND}
-		sys-devel/gettext
-		dev-util/intltool
-		dev-util/gperf
-		sys-devel/flex
-		doc? ( app-doc/doxygen )
-		>=dev-util/boost-build-1.32"
-
-pkg_setup() {
-	enewuser drizzle -1 -1 /dev/null nogroup
-}
-
-src_prepare() {
-	AT_M4DIR="m4" eautoreconf
-	elibtoolize
-}
-
-src_configure() {
-	local myconf=
-
-	if use debug; then
-		append-cppflags -DDEBUG
-	fi
-
-	# while I applaud upstreams goal of 0 compiler warnings
-	# the 1412 release didn't achieve it.
-	append-flags -Wno-error
-
-	# Bug #362901
-	append-cppflags -DBOOST_FILESYSTEM_VERSION=2
-
-	# NOTE disable-all and without-all no longer recognized options
-	# NOTE using --enable on some plugins can cause test failures.
-	# --with should be used instead. A discussion about this here:
-	# https://bugs.launchpad.net/drizzle/+bug/598659
-	# TODO (upstream)
-	# $(use_with memcache memcached-stats-plugin) \
-	# $(use_with memcache memcached-functions-plugin) \
-
-	econf \
-		--disable-static \
-		--disable-dependency-tracking \
-		--disable-mtmalloc \
-		$(use_enable tcmalloc) \
-		$(use_enable memcache libmemcached) \
-		$(use_enable gearman libgearman) \
-		$(use_enable ldap libldap) \
-		$(use_with curl auth-http-plugin) \
-		$(use_with pam auth-pam-plugin) \
-		$(use_with md5 md5-plugin) \
-		$(use_with gearman gearman-udf-plugin) \
-		$(use_with gearman logging-gearman-plugin) \
-		$(use_with ldap auth-ldap-plugin) \
-		--without-hello-world-plugin \
-		--disable-pbxt-plugin --without-pbxt-plugin \
-		--disable-rabbitmq-plugin --without-rabbitmq-plugin \
-		$(use_enable haildb libhaildb) \
-		$(use_enable haildb haildb-plugin) \
-		$(use_with haildb haildb-plugin) \
-		--with-auth-test-plugin \
-		--with-auth-file-plugin \
-		--with-simple-user-policy-plugin \
-		--enable-logging-stats-plugin \
-		--with-logging-stats-plugin \
-		--enable-console-plugin \
-		--enable-archive-plugin \
-		${myconf}
-
-}
-
-src_compile() {
-	emake all $(use doc && echo doxygen) || die "build failed"
-}
-
-# 5-10 min eta
-src_test() {
-	# If you want to turn off a test, rename to suffix of .DISABLED
-	# Explicitly allow parallel make check
-	emake check || die "tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc AUTHORS NEWS README || die
-
-	find "${D}" -name '*.la' -delete || die
-
-	if use doc; then
-		docinto apidoc
-		pushd docs/html
-		dohtml -r .
-		popd
-	fi
-
-	newinitd "${FILESDIR}"/drizzle.init.d drizzled || die
-	newconfd "${FILESDIR}"/drizzle.conf.d drizzled || die
-
-	if ! use gearman; then
-		sed -i -e '/need gearmand/d' "${D}"/etc/init.d/drizzled \
-			|| die "unable to sed init script (gearman)"
-	fi
-
-	if ! use memcache; then
-		sed -i -e '/need memcached/d' "${D}"/etc/init.d/drizzled \
-			|| die "unable to sed init script (memcache)"
-	fi
-
-	keepdir /var/run/drizzle || die
-	keepdir /var/log/drizzle || die
-	keepdir /var/lib/drizzle/drizzled || die
-	keepdir /etc/drizzle || die
-
-	fperms 0755 /var/run/drizzle || die
-	fperms 0755 /var/log/drizzle || die
-	fperms -R 0700 /var/lib/drizzle || die
-
-	fowners drizzle:nogroup /var/run/drizzle || die
-	fowners drizzle:nogroup /var/log/drizzle || die
-	fowners -R drizzle:nogroup /var/lib/drizzle || die
-
-	pamd_mimic system-auth drizzle auth account session
-}
diff --git a/dev-db/drizzle/metadata.xml b/dev-db/drizzle/metadata.xml
index 2d230c9e8857..ed2cb0bbc5fa 100644
--- a/dev-db/drizzle/metadata.xml
+++ b/dev-db/drizzle/metadata.xml
@@ -39,10 +39,6 @@
 		<flag name="md5">
       Enable the MD5 plugin, using <pkg>dev-libs/libgcrypt</pkg>; this
       replaces the older openssl and gnutls USE flags.
-    </flag>
-		<flag name="haildb">
-      Use the <pkg>dev-db/haildb</pkg> libraries to replace the innodb
-      plugin storage engine with haildb (an innodb fork).
     </flag>
 		<flag name="v8">
       Use <pkg>dev-lang/v8</pkg>.
diff --git a/dev-db/freetds/Manifest b/dev-db/freetds/Manifest
index 493235d2b120..d848f3a2118c 100644
--- a/dev-db/freetds/Manifest
+++ b/dev-db/freetds/Manifest
@@ -1,3 +1 @@
-DIST freetds-0.64.tar.gz 1414954 SHA256 27eeef4049590f459189f859fa73dae27604ea0bf4f197e304f9934c39312c3b SHA512 133f7b9655e1b0412a8a0c43b1b693d352c2eaeab17761028785be1e3bd1b64cd40f6e493f85989abefca63cfd80cace7f1729653bec89ac6bcb4186e4d9c7e5 WHIRLPOOL ab35044c900d32cbbd21b213ff07a7c41b8e4295bccff46de73dfe2219172b842bf13bb526bf85cf162ab296c9af12854f180453f633560c06698deed2f87371
-DIST freetds-0.82.tar.gz 1596755 SHA256 e2731483614bd992c8cb133bcc38432de13cfa243cc1327f37412db50c99b2b6 SHA512 7c93153e1da06c8196702edac39cd5d9cd7d1289e71eec69211f379a0f0d4d384af2a920be2c4b2d87fea770f68417d633e29ceaaa0f6f5e140ccd1d28771276 WHIRLPOOL 12dd4cff6e0841f644b13e0727eb958f62fd470c04ba7dc8bb0ebc0df7bf39af9a0a1d579fb16382a5f41bbb4f325f04d1b40d61da700147d3decc7fccfd66c6
 DIST freetds-0.91.tar.gz 2136329 SHA256 6a8148bd803aebceac6862b0dead1c5d9659f7e1038993abfe0ce8febb322465 SHA512 4dadafe49848ab5505b0fa5bd650e19e7652c3e1181d3c49f087c50ed055f395eaf5917a99744ed3594e4af9032c4e18f397af58fb1010e695ac2c0bc601b5e3 WHIRLPOOL 63662b56011edb6d22ce28cc7bad3af272ff81862f0d8ff65b113af260e3c8d05a9d941c1cf4b8039b99f460c3a5c8364dd69d42d8e98c0c92530462f732dec2
diff --git a/dev-db/freetds/freetds-0.64.ebuild b/dev-db/freetds/freetds-0.64.ebuild
deleted file mode 100644
index e2e0436ac0b0..000000000000
--- a/dev-db/freetds/freetds-0.64.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/freetds-0.64.ebuild,v 1.13 2014/08/10 19:58:52 slyfox Exp $
-
-DESCRIPTION="Tabular Datastream Library"
-HOMEPAGE="http://www.freetds.org/"
-SRC_URI="http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="odbc mssql"
-
-DEPEND="odbc? ( dev-db/unixODBC )"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	local myconf
-	use odbc && myconf="--with-unixodbc=/usr"
-	use mssql && myconf="${myconf} --enable-msdblib"
-	econf --with-tdsver=7.0 ${myconf} --cache-file="${S}/config.cache"
-	emake || die "emake failed"
-}
-
-RESTRICT="test"
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-}
diff --git a/dev-db/freetds/freetds-0.82-r3.ebuild b/dev-db/freetds/freetds-0.82-r3.ebuild
deleted file mode 100644
index 310ff1e3d586..000000000000
--- a/dev-db/freetds/freetds-0.82-r3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/freetds/freetds-0.82-r3.ebuild,v 1.6 2014/08/10 19:58:52 slyfox Exp $
-
-EAPI="3"
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="Tabular Datastream Library"
-HOMEPAGE="http://www.freetds.org/"
-SRC_URI="http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="odbc iodbc mssql"
-
-RESTRICT="test"
-
-DEPEND="
-	iodbc? ( dev-db/libiodbc )
-	odbc? ( dev-db/unixODBC )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	config_rpath_update
-	sed -ie 's:with_iodbc/include":with_iodbc/include/iodbc":' configure.ac
-	eautoreconf
-}
-
-src_configure() {
-	myconf="--with-tdsver=7.0 $(use_enable mssql msdblib)"
-
-	if use iodbc ; then
-		myconf="${myconf} --enable-odbc --with-iodbc=${EPREFIX}/usr"
-	elif use odbc ; then
-		myconf="${myconf} --enable-odbc --with-unixodbc=${EPREFIX}/usr"
-	fi
-
-	use elibc_glibc || append-libs iconv
-
-	econf $myconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" DOCDIR="doc/${PF}" install || die "make install failed"
-}
diff --git a/dev-db/haildb/Manifest b/dev-db/haildb/Manifest
index 851f1b191a18..2d449395fe32 100644
--- a/dev-db/haildb/Manifest
+++ b/dev-db/haildb/Manifest
@@ -1,3 +1 @@
-DIST haildb-2.2.0.tar.gz 1637631 SHA256 49e4c1d491852c5f15d74e2a2e62320317a15914ad6f1734440380bbc8f83fc9 SHA512 4aca8d871ddcaca711ccefc948346aa081da0fdde38281cdbf78d2860c7b069790bd9ae6596f0797f10f00f57f8e577b24c1ce03bbd474da6e42df2084932864 WHIRLPOOL 10a53315a83a6015a7607b12e0cf0fa0a8a4a45e721d5d13b1128af9b775b70b6843516e43edd339ad1c7552db1e83099ae08f15f7847fac7c8c1a9fe79ec67f
-DIST haildb-2.3.1.tar.gz 1657675 SHA256 6825098de9613647260984d40c50c09bac3a00227f8a73f9de169842dcaf48dd SHA512 0ebfda90333a7bac40ac61611fe15308c520cab5c3c21b4965cc40e5bce54df7d271606da8abd0c85f48357e7545961cd892e5239fcf5b9648f2c41682ff6406 WHIRLPOOL 2525ef949067915947659bef2b3dbc1421277842300f19773ce2dc5001275b0dbc4825e2c7ae23dc8f9f7a0f045a90c2ef30886e2c497809805569d8a21fbb1e
 DIST haildb-2.3.2.tar.gz 1687216 SHA256 4dff658c27d68c1c72b8e985fa9c20ad0e2095a573cca13c77c7ffb582f8c0af SHA512 4e3cf9a90242c27a61b4aa93903ee2e2e329613ae939332ae969901409824eb185310e0145c5728aca058af664f95bb7ffa60448ede9b8c216318db9f9ce49fd WHIRLPOOL 81a3abe16e8447964d898417a7f565adf41de02725f88bc1e085c5c298f172821348ecdd2f7eaf0a6fb024c0894461b0a3ff83f0d1f47abb8ada76ad46fecb96
diff --git a/dev-db/haildb/haildb-2.2.0.ebuild b/dev-db/haildb/haildb-2.2.0.ebuild
deleted file mode 100644
index fea875e601cf..000000000000
--- a/dev-db/haildb/haildb-2.2.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/haildb/haildb-2.2.0.ebuild,v 1.2 2010/10/18 13:24:54 flameeyes Exp $
-
-EAPI=2
-
-inherit versionator flag-o-matic
-
-DESCRIPTION="a relational database in shared library form"
-HOMEPAGE="http://www.haildb.com/"
-SRC_URI="http://launchpad.net/haildb/$(get_major_version).x/$(get_version_component_range 1-2)/+download/${P}.tar.gz"
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug tcmalloc zlib"
-
-RDEPEND="tcmalloc? ( dev-util/google-perftools )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	sys-devel/bison"
-
-src_configure() {
-	local myconf
-
-	if use debug; then
-		# Since --with-debug would turn off optimisations as well as
-		# enabling debug, we just enable debug through the
-		# preprocessor then.
-		append-flags -DDEBUG
-	else
-		myconf="${myconf} --disable-assert"
-	fi
-
-	# never allow it to find valgrind, easier this way
-	export ac_cv_header_valgrind_memcheck_h=no
-
-	econf \
-		--disable-static \
-		--disable-dependency-tracking \
-		--enable-fast-install \
-		--disable-silent-rules \
-		--disable-mtmalloc \
-		$(use_enable zlib compression) \
-		$(use_enable tcmalloc) \
-		${myconf} \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc ChangeLog README || die
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-db/haildb/haildb-2.3.1.ebuild b/dev-db/haildb/haildb-2.3.1.ebuild
deleted file mode 100644
index a2521e54a730..000000000000
--- a/dev-db/haildb/haildb-2.3.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/haildb/haildb-2.3.1.ebuild,v 1.3 2010/10/25 00:23:07 fauli Exp $
-
-EAPI=2
-
-inherit versionator flag-o-matic
-
-DESCRIPTION="a relational database in shared library form"
-HOMEPAGE="http://www.haildb.com/"
-SRC_URI="http://launchpad.net/haildb/$(get_version_component_range 1-2)/athens/+download/${P}.tar.gz"
-LICENSE="GPL-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug tcmalloc zlib"
-
-RDEPEND="tcmalloc? ( dev-util/google-perftools )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	sys-devel/bison"
-
-src_configure() {
-	local myconf
-
-	if use debug; then
-		# Since --with-debug would turn off optimisations as well as
-		# enabling debug, we just enable debug through the
-		# preprocessor then.
-		append-flags -DDEBUG
-	else
-		myconf="${myconf} --disable-assert"
-	fi
-
-	# never allow it to find valgrind, easier this way
-	export ac_cv_header_valgrind_memcheck_h=no
-
-	econf \
-		--disable-static \
-		--disable-dependency-tracking \
-		--enable-fast-install \
-		--disable-silent-rules \
-		--disable-mtmalloc \
-		$(use_enable zlib compression) \
-		$(use_enable tcmalloc) \
-		${myconf} \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc ChangeLog README || die
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-db/m17n-contrib/Manifest b/dev-db/m17n-contrib/Manifest
index 7e357ef0e4c6..af11f37ea2f3 100644
--- a/dev-db/m17n-contrib/Manifest
+++ b/dev-db/m17n-contrib/Manifest
@@ -1,7 +1,2 @@
-DIST m17n-contrib-1.1.10.tar.gz 631206 SHA256 9be6a2a9264e780f2bd230aa49f96cbd56099d5570ac07dd2427969a6225af33 SHA512 13e95d8c8e77512d5127118db6868d806c68cbb68b257c225deb8ff12d8a6a3fe789748d08352e9dbe89cb35eda787604bcf3fda29395129ef8cd610f265bd1e WHIRLPOOL 4298354294734e832b65301e948bebe86ed7cd1329872d4f520422f5f8a0201c898851b17e140454d3651c5825823af1590fc7d8584bfea2b5b2e5085eca65a0
-DIST m17n-contrib-1.1.12.tar.gz 680259 SHA256 c633ad40052e2291cef0768a593b227cbe015550455c553a0388e33b7be2fbd7 SHA512 5d625ae1de2d1cd74c645c0c1fd44d7f4e85266b865a854fbd4511a2d74b8ab51a1abdf81de4411653d17b5a1aac2da8acdaf91cc916e01ab9c4d592727098aa WHIRLPOOL 6df8597bb2fea54aee229f9cd2c315b9951b219b8a93494389d91c99227625bec5fb91118af1d90b37ebaabc39840819876394e2b2e428f4086af6449e6332db
 DIST m17n-contrib-1.1.13.tar.gz 697293 SHA256 adcf708ea7abd651b4a72562059b4b2408b9729527330a28f1a467168d27de6c SHA512 09b04315162b197bbada94e4213108a7b02e2349e519e311b545faefcb057f0bd5345a18f8eb3e9bb96843c2e8f04f56685e0347ede0ccade1b79caf459cb945 WHIRLPOOL e1bdcf80b41bcacc4717e4c5a364c10c0e857e14528420f3537ed7d76d4ae28daedb98e023433fa192cb78169c1cbdb2d38fd3691f7e5ad7798c5e858ce158b6
 DIST m17n-contrib-1.1.14.tar.gz 698611 SHA256 4f623be23979e2d52c1275621b3d4488c24b9fbd81f5a9d28260d88f93d23d2c SHA512 569149dc4318e033ecde347cd9f935b6e18fefdd8f24d8a447aed3f754a920cec53b5f7a806d93032a45c05a346076c38a3a5b6398cf4caadc7db0e52baf5ced WHIRLPOOL be907582d6774dcc48a94c2bd689dd19a01ffa456cd22728dcdd4ba3b340daa093eca7890b32f88b38e570d9c5b7316e7c7552f547199ff1efd687801549d088
-DIST m17n-contrib-1.1.7.tar.gz 522515 SHA256 3592aecbf5d65e28c4997da12ed2afd5f1397b889819b4347f2b10706712fb33 SHA512 17aa1601732c4aca0d9c0ed0bc96967b72e8e4fdd012df637342dd3ae468e4d3a597ae722ce758720cb89a585187a90ca98121142b98cd234ddbce6ba0b2598a WHIRLPOOL 13f53536719d03dd5ec542e18161eda46b1ca168c3d4090dcf42d02e3fc074a7f4953d9e76539d595ed70b17edee3a24f9bc5c2c4272a59635e05d515d4386e9
-DIST m17n-contrib-1.1.8.tar.gz 527133 SHA256 9cdbaa50ec638d321bfc8257fc6de2e474194430e46c42adad77f6554fa97def SHA512 bf02ac3cadd4051b97a4608b8f7df44486fa1d762b9e7c140296ca3dc2fc3df677d4a9ff6db3fa3e84241b02adaaf58cbc4c55ccf38c8486f4de57a4bb81a327 WHIRLPOOL f278cdc7426ae373003f0c12c06e9d5e1496e0d739463722ffe99d4a2da35d2aa9de1cd1373274c45fa775fdc285940fc0f0151ab00f4e1f5b39e3b754e0a572
-DIST m17n-contrib-1.1.9.tar.gz 526979 SHA256 cb04eb8458606c7614da142c631581f6480de856edffb6debc3f1e0512d2806f SHA512 28e8da7b05cb5480fa4851916c920b4e052fb0364ea14918df7ea2bda9a16f43afb6f946cc7a7b4fd75a72504708a5913742d7f1bf5ddae2e78ea7700cdd2ed1 WHIRLPOOL e5432acd8f9a2530cbb319a621409672c736100780961bb8e2800ff431a6e27821d60df00d78216990b1bff1ebb378f92c7539f3af9f1048b3a226964da38991
diff --git a/dev-db/m17n-contrib/m17n-contrib-1.1.10.ebuild b/dev-db/m17n-contrib/m17n-contrib-1.1.10.ebuild
deleted file mode 100644
index 08649b7314be..000000000000
--- a/dev-db/m17n-contrib/m17n-contrib-1.1.10.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-contrib/m17n-contrib-1.1.10.ebuild,v 1.2 2012/12/03 07:32:46 naota Exp $
-
-DESCRIPTION="Contribution database for the m17n library"
-HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
-SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-db/m17n-db"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
diff --git a/dev-db/m17n-contrib/m17n-contrib-1.1.12.ebuild b/dev-db/m17n-contrib/m17n-contrib-1.1.12.ebuild
deleted file mode 100644
index 7a338d21a78a..000000000000
--- a/dev-db/m17n-contrib/m17n-contrib-1.1.12.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-contrib/m17n-contrib-1.1.12.ebuild,v 1.2 2012/12/03 07:32:46 naota Exp $
-
-EAPI=4
-
-DESCRIPTION="Contribution database for the m17n library"
-HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
-SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-db/m17n-db"
-
-src_configure() {
-	# force the script not to test for m17n presence, trust Portage
-	# dependency handling.
-	export HAVE_M17N_DB=yes
-
-	econf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/dev-db/m17n-contrib/m17n-contrib-1.1.7.ebuild b/dev-db/m17n-contrib/m17n-contrib-1.1.7.ebuild
deleted file mode 100644
index 65541f3c6497..000000000000
--- a/dev-db/m17n-contrib/m17n-contrib-1.1.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-contrib/m17n-contrib-1.1.7.ebuild,v 1.3 2012/12/03 07:32:46 naota Exp $
-
-DESCRIPTION="Contribution database for the m17n library"
-HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
-SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-db/m17n-db"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/dev-db/m17n-contrib/m17n-contrib-1.1.8.ebuild b/dev-db/m17n-contrib/m17n-contrib-1.1.8.ebuild
deleted file mode 100644
index d52e3db5cb8b..000000000000
--- a/dev-db/m17n-contrib/m17n-contrib-1.1.8.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-contrib/m17n-contrib-1.1.8.ebuild,v 1.2 2012/12/03 07:32:46 naota Exp $
-
-DESCRIPTION="Contribution database for the m17n library"
-HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
-SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-db/m17n-db"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/dev-db/m17n-contrib/m17n-contrib-1.1.9.ebuild b/dev-db/m17n-contrib/m17n-contrib-1.1.9.ebuild
deleted file mode 100644
index 4fd3289a4faa..000000000000
--- a/dev-db/m17n-contrib/m17n-contrib-1.1.9.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-contrib/m17n-contrib-1.1.9.ebuild,v 1.2 2012/12/03 07:32:46 naota Exp $
-
-DESCRIPTION="Contribution database for the m17n library"
-HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
-SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-db/m17n-db"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/dev-db/m17n-db/Manifest b/dev-db/m17n-db/Manifest
index 45b2551d102b..ea7740941881 100644
--- a/dev-db/m17n-db/Manifest
+++ b/dev-db/m17n-db/Manifest
@@ -1,6 +1,4 @@
 DIST m17n-db-1.5.2.tar.gz 1284002 SHA256 d05ecb11faafffbb7f07c6620a75d612bf27009e06da0e71a2163b2292bdd448 SHA512 d24acc5a067d1fefce438c1af4a1a2245f5ec609206226f03cdd3a2af2d32e602c0bec197207fbe89f90748626f2ff064d8dfcdc7690f6801f060ce15f3d0903 WHIRLPOOL bbe70a28ab4cb3ffa7a139d70caadc708c76510b1d5a4803736fbc6cb3025bd7497de32fea1bcb45beafdb55292a242ea6a0256bb3aab0ab38a9eb368a815700
-DIST m17n-db-1.5.3.tar.gz 1282668 SHA256 23369d452102809b7985c50eeee7a0880c19a04aa8f34b9ef58eae8502aa731d SHA512 84185e314dc4bbb092dcee9c9130315111a19f80b16157145c2aef334aebeae408bcbb8c03c9da20aaa7023db3e22f09dfd3f1c5dfca02784e41d544e545d89c WHIRLPOOL 39fec7c59ff2837f90aa1884dfee01a1edccaf3748ef3a5c927a05d317b559cf02ace509a4a2d85bcdaace8871b9bcd3a387cbe5e43e25592ce8c7e8f735736b
-DIST m17n-db-1.5.4.tar.gz 1323620 SHA256 ee8d9965068371136c91d3fedf6e493b565216c880b6fc06dc5e0e08a400097f SHA512 32a13eccf8335999c2b42c13f3d77e54087280bf2235447343bd16da71fe3e60a7bf8698d04d2e49ac227246219a0386320bbc995e78b50f43c01778796f9b4f WHIRLPOOL 006e5a4a5449cf902bbb258e81f475515259f8c9c715dd1b6e77f840c29904b09fd33710aa44e5018d0f5e74bf4bdd9c6f382e256d2f1f0f17cb89f8dcbf6dc0
 DIST m17n-db-1.5.5.tar.gz 1322255 SHA256 4f5bb75e3a0252a47b2628a09adf1ff16c4f160a38aea7ac394b74878ceed14f SHA512 40ad61d9843d0ae37744d63dc8835084e4eba55ac41a307cb10d79e0cbeed849fd53cb3ddeab0d234f5c783e04205cb84a75ec093beb2a2eba11c45f0b57b1f7 WHIRLPOOL b3a06c7808e0b98b369308639a01b0f1c16e00b091eaf72d835350d6def3b4dd45f2ffa4fb3db389032babe588d24b4ec30c5f1678dfffc771d7f304d557e892
 DIST m17n-db-1.6.2.tar.gz 1385431 SHA256 757ce99b852cb08867b2027223c5324248f3fab0b81fb71f478f8dfdfb3cfb24 SHA512 89c51eba7d30f284c4e226eff95984f7b736bfb45ef69bf98fbb419c26f8b7bb2d41adf01c6f108c12ffaf2d7d84492edf33c10763dfe4f068e36586b9ac88cf WHIRLPOOL da58f44d3a423c38956bb267c90e8661f00e1fdec94f5234836be758577c72b5404571dea4694f724bd75a124501bbb26a31cc44c7e088057513d721ff70629c
 DIST m17n-db-1.6.3.tar.gz 1384587 SHA256 5f1d11b43efa4c1fcc9681d0c0e13f8d241450625f34351a9deb2a7194cac211 SHA512 4a808b7f8298b9c15c479e7e2dbe26dfe39b0756da5f7a5f968700950d5e41527ce935bc6ced6e65d5e0d57c5f8402dba7f6001144f805129def8237d272625f WHIRLPOOL 55657e6fdc47da30de6ec9094b27b861d37b74a65a5d25b5dcd3ccc94a1057692442cdc40f68b0e67e893688aa5eb6fffa8f118d158d3518ae188638c3a26fdc
diff --git a/dev-db/m17n-db/m17n-db-1.5.3.ebuild b/dev-db/m17n-db/m17n-db-1.5.3.ebuild
deleted file mode 100644
index b462da714a5b..000000000000
--- a/dev-db/m17n-db/m17n-db-1.5.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-db/m17n-db-1.5.3.ebuild,v 1.4 2012/12/03 06:54:07 naota Exp $
-
-DESCRIPTION="Database for the m17n library"
-HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
-SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="sys-devel/gettext"
-RDEPEND="virtual/libintl"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-	docinto FORMATS; dodoc FORMATS/*
-	docinto UNIDATA; dodoc UNIDATA/*
-}
diff --git a/dev-db/m17n-db/m17n-db-1.5.4.ebuild b/dev-db/m17n-db/m17n-db-1.5.4.ebuild
deleted file mode 100644
index ac0062ac1140..000000000000
--- a/dev-db/m17n-db/m17n-db-1.5.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/m17n-db/m17n-db-1.5.4.ebuild,v 1.2 2012/12/03 06:54:07 naota Exp $
-
-DESCRIPTION="Database for the m17n library"
-HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
-SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="sys-devel/gettext"
-RDEPEND="virtual/libintl"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README
-	docinto FORMATS; dodoc FORMATS/*
-	docinto UNIDATA; dodoc UNIDATA/*
-}
diff --git a/dev-db/mysql-proxy/Manifest b/dev-db/mysql-proxy/Manifest
index 73a6c55bfce8..1a9dc987aca4 100644
--- a/dev-db/mysql-proxy/Manifest
+++ b/dev-db/mysql-proxy/Manifest
@@ -1,2 +1 @@
-DIST mysql-proxy-0.8.0.tar.gz 756371 SHA256 0a195fe0f86d12df8d9ffc27e91347680521c8702460bac5ed591608a740bc1c SHA512 c0283881d4e79d662ce61fcb361d72f4711114a3a9a089ab2f3d2b1dccdb0c316bc5223ea040f0efef7663e97080cd7e6415ce1a046b69bfa4fed8f9b9b272d0 WHIRLPOOL 349c573041a19d0ad8d164b2e9a2e3334daa25e3bbecb0e16a08cb9a257fc55660da720f4ed3832233b3ee2ebc9ed33f0ccea959c2cbf23587d2d1f37b764070
 DIST mysql-proxy-0.8.2.tar.gz 861995 SHA256 3955d9a60249d36b2c5c949706f7a3294419d2563c1e8474164a3a307865f550 SHA512 e083ea6344bf2d3b85a38127e42cbab659a959684f7f0f63272fa0df926d6d32dbbaaab2b6479ee8fc227fbc9af6f24e855d19700ec1ab4b904c5e638b4d64c8 WHIRLPOOL e7c3355b221c7d150004a3bcb02db28c67759d9c83f9d8d4219c2b8e403d176fdbe562e05f5e7ea1e6768f78144a4438678991fcc974448e2c271405d8c6f3a2
diff --git a/dev-db/mysql-proxy/mysql-proxy-0.8.0-r1.ebuild b/dev-db/mysql-proxy/mysql-proxy-0.8.0-r1.ebuild
deleted file mode 100644
index 34d93ee32084..000000000000
--- a/dev-db/mysql-proxy/mysql-proxy-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/mysql-proxy-0.8.0-r1.ebuild,v 1.3 2012/05/03 02:33:17 jdhore Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="A Proxy for the MySQL Client/Server protocol"
-HOMEPAGE="http://forge.mysql.com/wiki/MySQL_Proxy"
-SRC_URI="mirror://mysql/Downloads/MySQL-Proxy/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-RDEPEND=">=dev-libs/libevent-1.4
-	>=dev-libs/glib-2.16
-	>=dev-lang/lua-5.1"
-DEPEND="${RDEPEND}
-	>=virtual/mysql-5.0
-	virtual/pkgconfig"
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		--includedir=/usr/include/${PN} \
-		--with-mysql \
-		--with-lua \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
-	newconfd "${FILESDIR}"/${PN}.confd-0.8.0-r1 ${PN} || die
-	dodoc ChangeLog NEWS README
-	if use examples; then
-		docinto examples
-		dodoc examples/*.lua || die
-		dodoc lib/*.lua || die
-	fi
-	# mysql-proxy will refuse to start unless the config file is at most 0660.
-	insinto /etc/mysql
-	insopts -m0660
-	doins "${FILESDIR}"/${PN}.cnf || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "You might want to have a look at"
-	einfo "http://dev.mysql.com/tech-resources/articles/proxy-gettingstarted.html"
-	einfo "on how to get started with MySQL Proxy."
-	einfo
-}
diff --git a/dev-db/mysql-proxy/mysql-proxy-0.8.2.ebuild b/dev-db/mysql-proxy/mysql-proxy-0.8.2.ebuild
deleted file mode 100644
index 7c15a9290c19..000000000000
--- a/dev-db/mysql-proxy/mysql-proxy-0.8.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-proxy/mysql-proxy-0.8.2.ebuild,v 1.2 2015/02/01 18:19:07 neurogeek Exp $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="A Proxy for the MySQL Client/Server protocol"
-HOMEPAGE="http://forge.mysql.com/wiki/MySQL_Proxy"
-SRC_URI="mirror://mysql/Downloads/MySQL-Proxy/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-RDEPEND="<dev-libs/libevent-2.1
-	>=dev-libs/glib-2.16
-	>=dev-lang/lua-5.1"
-DEPEND="${RDEPEND}
-	>=virtual/mysql-5.0
-	virtual/pkgconfig"
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		--includedir=/usr/include/${PN} \
-		--with-mysql \
-		--with-lua \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newinitd "${FILESDIR}"/${PN}.initd ${PN} || die
-	newconfd "${FILESDIR}"/${PN}.confd-0.8.0-r1 ${PN} || die
-	dodoc ChangeLog NEWS README
-	if use examples; then
-		docinto examples
-		dodoc examples/*.lua || die
-		dodoc lib/*.lua || die
-	fi
-	# mysql-proxy will refuse to start unless the config file is at most 0660.
-	insinto /etc/mysql
-	insopts -m0660
-	doins "${FILESDIR}"/${PN}.cnf || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "You might want to have a look at"
-	einfo "http://dev.mysql.com/tech-resources/articles/proxy-gettingstarted.html"
-	einfo "on how to get started with MySQL Proxy."
-	einfo
-}
diff --git a/dev-db/mysql-workbench/Manifest b/dev-db/mysql-workbench/Manifest
index de281abc1f72..19ef439a3df2 100644
--- a/dev-db/mysql-workbench/Manifest
+++ b/dev-db/mysql-workbench/Manifest
@@ -1,5 +1,4 @@
 DIST antlr-3.4-complete.jar 2388361 SHA256 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 SHA512 04be4dfba3a21f3ab9d9e439a64958bd8e844a9f151b798383bd9e0dd6ebc416783ae7cb1d1dbb27fb7288ab9756b13b8338cdb8ceb41a10949c852ad45ab1f2 WHIRLPOOL 488b7b9af1d1d06cca163d43e7be190730e2f0421796c21a26ace11196ee37a16b1bdeea78a1e2e64f8ca0e87f67a2aecd066af21505f3dd92dd76de40a94fa0
-DIST mysql-workbench-community-6.0.9-src.tar.gz 22899136 SHA256 dc88637c62336dd3e68fb2213090c66be0ca81986b7659af934e63599e778e1f SHA512 a99156feed82ce61ff127ca4a26f825bde332c68ac81558b9112933f1eda45ab1a3e5faadada336f22ba4cc4197dbb9d48a33cb6a827823660eb8350119d492c WHIRLPOOL 443350529989336c978feb9b6cbd5b3fed300ecf534941eb4e000a49936f23d3a569a6e26e605f71adac8e7b36b9e95bff8aa8e92b90f4ae202d213f2832792c
 DIST mysql-workbench-community-6.2.5-src.tar.gz 13037465 SHA256 40a5dbf72b55441ea3e9466dce2de47611777c88da2b65b748f10b06dfa0794e SHA512 6cc9ba91a9fd4d19bdec157084fd5b510cc274e2851b54855441ad97dd042009064a00aa330a5689c18ed70a0996bf23411be475339ee96ba2ff5252c49d7839 WHIRLPOOL 74de61140edd91ee85c222338c02d3672869a0231bb25eb5f37c43a9cad2e280db521261a4ec6557e237c3f48cab84e92838a100949835fe85db924b5a382cba
 DIST mysql-workbench-community-6.3.3-src.tar.gz 14892631 SHA256 4511d63145b2a979310d84c9f0ca61b7460af2c87b81787b2f2404fd5095f419 SHA512 9736ed4f896b2819d5cde76a000a56b6ce36606262a83b5a0ba8dfc8760476eb43bcda08f258d856297924f3ddca2d89aadf0139fb156beb345f2a6fe5b0bc45 WHIRLPOOL 9e1054b8c18e854918133da62f67cc109f212812cd2509edfc775d4ebbc91b402a7b88b530e540eb67dadba6f6fd3d901b3f7a30b7a03a5a33537c677bbd0024
 DIST mysql-workbench-community-6.3.4-src.tar.gz 14954524 SHA256 be47f30c48c04f951a1be9b6496e4d94d5b975d6c693933ba2fa6e96718179d3 SHA512 8d7eacd46fd3cac912dac2fdbc0669759f9411796507cca76b0ad47228381b15b7f88e60a7a5a8763e704b456884828783cb0c7ed218025edb35aa5033d7d02f WHIRLPOOL 9e00ce475e573ee8b875d9f25d73d488cf68ff96b2eb006dba1dc7e424c70a0650cac42dcc3ed34648c5879354cab5311eaf6729e9b307718935d543c4f43bf5
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.0.7-PCRE-as_needed.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.0.7-PCRE-as_needed.patch
deleted file mode 100644
index d1c7059bb1e8..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.0.7-PCRE-as_needed.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- library/base/CMakeLists.txt	2013-08-09 17:32:49.000000000 +0200
-+++ library/base/CMakeLists.txt	2013-08-26 00:10:45.695132307 +0200
-@@ -2,6 +2,6 @@
- 
- add_library(wbbase util_functions.cpp sqlstring.cpp file_functions.cpp file_utilities.cpp threaded_timer.cpp string_utilities.cpp geometry.cpp notifications.cpp ui_form.cpp config_file.cpp drawing.cpp log.cpp threading.cpp profiling.cpp)
- 
--target_link_libraries(wbbase ${CAIRO_LIBRARIES} ${GLIB_LIBRARIES} ${GTHREAD_LIBRARIES})
-+target_link_libraries(wbbase ${CAIRO_LIBRARIES} ${GLIB_LIBRARIES} ${GTHREAD_LIBRARIES} ${PCRE_LIBRARIES})
- 
- install(TARGETS wbbase DESTINATION ${WB_INSTALL_LIB_DIR})
---- backend/wbprivate/CMakeLists.txt	2013-08-09 17:32:50.000000000 +0200
-+++ backend/wbprivate/CMakeLists.txt	2013-08-26 00:24:34.762132208 +0200
-@@ -6,6 +6,7 @@
-     ${GRT_INCLUDE_DIRS}
-     ${ANTLR3C_INCLUDE_DIRS}
-     ${MYSQLCPPCONN_INCLUDE_DIRS}
-+    ${PCRE_INCLUDE_DIRS}
-     ${PROJECT_SOURCE_DIR}
-     ${PROJECT_SOURCE_DIR}/library/grt/src 
-     ${PROJECT_SOURCE_DIR}/library/base
-@@ -97,6 +98,7 @@
-     ${SIGC++_LIBRARIES}
-     ${LIBZIP_LIBRARIES}
-     ${TINYXML_LIBRARY}
-+    ${PCRE_LIBRARIES}
- )
- 
- #install(TARGETS wbprivate DESTINATION ${WB_INSTALL_LIB_DIR})
---- backend/wbpublic/CMakeLists.txt	2013-08-09 17:32:53.000000000 +0200
-+++ backend/wbpublic/CMakeLists.txt	2013-08-26 00:24:09.226132211 +0200
-@@ -176,6 +176,6 @@
- #	)
- #endif()
- 
--target_link_libraries(wbpublic wbbase mdcanvas mforms cdbc ${VSQLITE_LIBRARIES} wbscintilla mysqlparser ${CAIRO_LIBRARIES} ${GNOME_KEYRING_LIBRARIES} ${CTEMPLATE_LIBRARIES} ${OPENGL_LIBRARIES})
-+target_link_libraries(wbpublic wbbase mdcanvas mforms cdbc ${VSQLITE_LIBRARIES} wbscintilla mysqlparser ${CAIRO_LIBRARIES} ${GNOME_KEYRING_LIBRARIES} ${CTEMPLATE_LIBRARIES} ${OPENGL_LIBRARIES} ${PCRE_LIBRARIES})
- 
- install(TARGETS wbpublic DESTINATION ${WB_INSTALL_LIB_DIR})
diff --git a/dev-db/mysql-workbench/files/mysql-workbench-6.0.8-CMakeLists.patch b/dev-db/mysql-workbench/files/mysql-workbench-6.0.8-CMakeLists.patch
deleted file mode 100644
index a6c6437e5494..000000000000
--- a/dev-db/mysql-workbench/files/mysql-workbench-6.0.8-CMakeLists.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- mysql-workbench-community-6.0.7-src/CMakeLists.txt	2013-08-30 18:05:12.000000000 +0200
-+++ mysql-workbench-community-6.0.7-src/CMakeLists.txt	2013-09-08 11:41:18.723838826 +0200
-@@ -18,6 +18,9 @@
- find_package(PkgConfig REQUIRED)
- 
- find_package(GTK2 2.6.2 REQUIRED gtk gtkmm)
-+if (NOT GTK2_FOUND)
-+	message( FATAL_ERROR "Not all GTK2 components were found!" )
-+endif()
- pkg_check_modules(GTHREAD REQUIRED gthread-2.0)
- pkg_check_modules(GMODULE REQUIRED gmodule-2.0)
- set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${GMODULE_INCLUDE_DIRS})
-@@ -32,7 +35,8 @@
- endif ()
- 
- # All known publicly available versions of Antlr3C are buggy
--
-+# see: https://bugzilla.redhat.com/show_bug.cgi?id=966973
-+# patch seems to be only applied partially to antlr-3.4, bug is present in antlr-3.5, too
- if (SKIP_BUNDLED_ANTLR)
-   find_package(Antlr3C)
- endif ()
-@@ -71,8 +75,8 @@
- find_package(TinyXML REQUIRED)
- 
- if (UNIX)
--	option(USE_UNIXODBC "Use unixODBC instead of iODBC" OFF)
--	if (USE_UNIXODBC)
-+	option(USE_IODBC "Use iODBC instead of unixODBC" ON)
-+	if (NOT USE_IODBC)
- 		find_package(UNIXODBC REQUIRED)
- 		set(ODBC_LIBRARIES ${UNIXODBC_LIBRARIES})
- 		set(ODBC_INCLUDE_DIRS ${UNIXODBC_INCLUDE_DIRS})
-@@ -89,7 +93,8 @@
- pkg_check_modules(CAIRO REQUIRED cairo>=1.5.12)
- pkg_check_modules(UUID REQUIRED uuid)
- pkg_check_modules(LIBZIP REQUIRED libzip)
--if (UNIX)
-+
-+if (UNIX AND USE_GNOME_KEYRING)
- 	pkg_check_modules(GNOME_KEYRING gnome-keyring-1)
- 	if (GNOME_KEYRING_FOUND)
- 		set(KEYRING_DEFINITION     "HAVE_GNOME_KEYRING")
-@@ -99,7 +104,10 @@
- 			set(KEYRING_DEFINITION     "HAVE_OLD_GNOME_KEYRING")
- 		endif()
- 	endif()
-+	if (NOT GNOME_KEYRING_FOUND) 
-+		message( FATAL_ERROR "Gnome keyring libraries could not be found" )
-+	endif()
- endif()
- 
- include (CheckFunctionExists)
-        
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.0.9.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.0.9.ebuild
deleted file mode 100644
index a381b16aa03f..000000000000
--- a/dev-db/mysql-workbench/mysql-workbench-6.0.9.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-6.0.9.ebuild,v 1.5 2015/04/08 18:45:26 mgorny Exp $
-
-EAPI=5
-GCONF_DEBUG="no"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-CMAKE_MIN_VERSION="2.8.11.1"
-
-inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
-
-MY_P="${PN}-community-${PV}-src"
-
-DESCRIPTION="MySQL Workbench"
-HOMEPAGE="http://dev.mysql.com/workbench/"
-SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="debug doc gnome-keyring +iodbc"
-
-# glibc: deprecated mutex functions, removed in 2.36.0
-CDEPEND="${PYTHON_DEPS}
-		dev-libs/glib:2
-		dev-cpp/atkmm
-		dev-cpp/pangomm
-		>=dev-cpp/glibmm-2.14:2
-		>=dev-cpp/gtkmm-2.14:2.4
-		dev-libs/atk
-		x11-libs/pango
-		>=x11-libs/gtk+-2.6:2
-		gnome-base/libglade:2.0
-		>=x11-libs/cairo-1.5.12[glib,svg]
-		dev-libs/libsigc++:2
-		dev-libs/boost
-		>=dev-cpp/ctemplate-0.95
-		>=dev-libs/libxml2-2.6.2:2
-		dev-libs/libzip
-		>=virtual/mysql-5.1
-		dev-libs/libpcre
-		virtual/opengl
-		>=dev-lang/lua-5.1[deprecated]
-		|| ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
-		dev-libs/tinyxml[stl]
-		dev-db/mysql-connector-c++
-		dev-db/vsqlite++
-		!iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
-		gnome-keyring? ( gnome-base/libgnome-keyring )
-			dev-python/pexpect
-			>=dev-python/paramiko-1.7.4
-	"
-
-RDEPEND="${CDEPEND}
-		app-admin/sudo
-		>=sys-apps/net-tools-1.60_p20120127084908"
-
-DEPEND="${CDEPEND}
-		virtual/pkgconfig"
-
-S="${WORKDIR}"/"${MY_P}"
-
-src_prepare() {
-	## Patch CMakeLists.txt
-	epatch "${FILESDIR}/${PN}-6.0.8-CMakeLists.patch"
-
-	## remove hardcoded CXXFLAGS
-	sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
-
-	## package is very fragile...
-	strip-flags
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_use gnome-keyring GNOME_KEYRING)
-		$(cmake-utils_use_use iodbc IODBC)
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-		-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-		-DPYTHON_LIBRARY="$(python_get_library_path)"
-	)
-	cmake-utils_src_configure
-}
diff --git a/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild b/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild
index 58da47d7f9a4..5f307ca9e3b5 100644
--- a/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild
+++ b/dev-db/mysql-workbench/mysql-workbench-6.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/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild,v 1.1 2015/04/26 08:43:14 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-6.3.3.ebuild,v 1.2 2015/06/26 12:15:02 ago Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
@@ -20,7 +20,7 @@ SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz https://github.co
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug doc gnome-keyring"
 
 # glibc: deprecated mutex functions, removed in 2.36.0
diff --git a/dev-db/pgadmin3/pgadmin3-1.20.0-r1.ebuild b/dev-db/pgadmin3/pgadmin3-1.20.0-r1.ebuild
index 4a5475723421..cc3a7d953eff 100644
--- a/dev-db/pgadmin3/pgadmin3-1.20.0-r1.ebuild
+++ b/dev-db/pgadmin3/pgadmin3-1.20.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-db/pgadmin3/pgadmin3-1.20.0-r1.ebuild,v 1.1 2015/05/20 19:48:25 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgadmin3/pgadmin3-1.20.0-r1.ebuild,v 1.2 2015/06/26 14:29:19 ago Exp $
 
 EAPI="5"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.pgadmin.org/"
 SRC_URI="mirror://postgresql/${PN}/release/v${PV}/src/${P}.tar.gz"
 
 LICENSE="POSTGRESQL"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
 SLOT="0"
 IUSE="debug +databasedesigner"
 
diff --git a/dev-db/pgmemcache/Manifest b/dev-db/pgmemcache/Manifest
index 342364d01545..e45287d53336 100644
--- a/dev-db/pgmemcache/Manifest
+++ b/dev-db/pgmemcache/Manifest
@@ -1,6 +1,3 @@
 DIST pgmemcache-2.1.2.tar.gz 16685 SHA256 015bf72efd6e7bc392814e9ae49bc9c486e699e9dc80f0c437b42408b7155d67 SHA512 2be9aeef214f569473efcb849611e10c4fdb179e5cb8b1105f63fe0ab7bd829648a7891fd4e21109afc1b6375aeae0c2449a977a67631ee4d505e3faf83bc3f3 WHIRLPOOL 7f7c62400316da6c8ed2da0e1909ab8034e8f845d4b3d439fbdf54b310d8fe1100e7c487a3d7485a3e86358fe493bf1bb5107b4d0f4ab1091bf6467a04fe6eac
 DIST pgmemcache-2.2.0.tar.gz 17742 SHA256 c16e062f6ae4ad9345b26ae0caf70e7169eb2a4fa316197b578a76095df5c5a2 SHA512 8d63aa25fec9c5f1895cf5107bbb261be2b35d5e05ac03e8fa59597ed18cf123c45aa0690eafeca4a26bdfabf61088bd1e2518c3fa13b683333b1ca0b5d8446f WHIRLPOOL a8a01bb98cb56ee3d0d19b2d7aeeeee38953c3310bafc2cd6737eb3114ceb78cd11d28626abb14114d92429cf1812a377b65470696fd4141a25253b0b9a92e0a
 DIST pgmemcache-2.3.0.tar.gz 21135 SHA256 7f9f545c02e13c842b20a1cb387e209ec0fb654ebb083828bcf08023ed6657e2 SHA512 75ae3b7c9087078b2276ebadf66f9d419323927f6b8c8f61f8681fe939d086dbfe6aa935f20afa3acc11171e00329e5758a8a6a952cfbcf3aef45c8cc3f50a3b WHIRLPOOL 2aad23d17a357ddf1ff00ef0b99501d25ffb420e7250e338924281a94f686a360daad167d7d136934083b390fb191da016c17db448fcbbb1e37ba41e1c8addd1
-DIST pgmemcache_2.0.4.tar.bz2 14359 SHA256 4f203116101f1836c238506e8b8f40be506f1737577630f4d10d8b9b43fc00ac SHA512 c3bc609cdd38eb0df88d7fe293258a6aede96d296e6dce63e99a5d3c78fece534a389afdcc99510e83a7572669421c8d61d2588949e4df9cbaf6d93fcd45f0c5 WHIRLPOOL 2f34e096dd4dd80c0ddd9166b724d3ed884d86ecd0117417098a4a9173c657c0eb3b0df1c68323dffd4222b12ab9cb9adebf14ee9c2a1ff563a0fbb81cd7b3b2
-DIST pgmemcache_2.0.6.tar.bz2 18630 SHA256 eb64059bbb2b7659768f2c654580a972b39e4bc8842dc8fc960e7d97c582a78c SHA512 35661ab90bc866820be370c7a65d951b7ea0fc63e9872b38fdfa0dc82d368974de9f044b74399747e2f11a2d26dd0309c0814d2f38636681d18abe67885134ff WHIRLPOOL e86618906807d770fa4c63b705f88c9e249bce428df3d8e8892113cbfb31a57c9c8a4f442aa54e3304dfa5dae07cfc236d50c077b16ce1e64a4c3b1f81d13513
-DIST pgmemcache_2.1.1.tar.bz2 18630 SHA256 eb64059bbb2b7659768f2c654580a972b39e4bc8842dc8fc960e7d97c582a78c SHA512 35661ab90bc866820be370c7a65d951b7ea0fc63e9872b38fdfa0dc82d368974de9f044b74399747e2f11a2d26dd0309c0814d2f38636681d18abe67885134ff WHIRLPOOL e86618906807d770fa4c63b705f88c9e249bce428df3d8e8892113cbfb31a57c9c8a4f442aa54e3304dfa5dae07cfc236d50c077b16ce1e64a4c3b1f81d13513
diff --git a/dev-db/pgmemcache/pgmemcache-2.0.4.ebuild b/dev-db/pgmemcache/pgmemcache-2.0.4.ebuild
deleted file mode 100644
index 3927e2d5dc5b..000000000000
--- a/dev-db/pgmemcache/pgmemcache-2.0.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgmemcache/pgmemcache-2.0.4.ebuild,v 1.4 2014/12/28 15:10:00 titanofold Exp $
-
-DESCRIPTION="A PostgreSQL API based on libmemcached to interface with memcached"
-HOMEPAGE="http://pgfoundry.org/projects/pgmemcache"
-SRC_URI="http://pgfoundry.org/frs/download.php/2672/${PN}_${PV}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-db/postgresql-8.4
-	>=dev-libs/libmemcached-0.39"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc README.pgmemcache NEWS || die "install documentation failed"
-}
diff --git a/dev-db/pgmemcache/pgmemcache-2.0.6.ebuild b/dev-db/pgmemcache/pgmemcache-2.0.6.ebuild
deleted file mode 100644
index 267bd7603fc1..000000000000
--- a/dev-db/pgmemcache/pgmemcache-2.0.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgmemcache/pgmemcache-2.0.6.ebuild,v 1.4 2014/12/28 15:10:00 titanofold Exp $
-
-DESCRIPTION="A PostgreSQL API based on libmemcached to interface with memcached"
-HOMEPAGE="http://pgfoundry.org/projects/pgmemcache"
-SRC_URI="http://pgfoundry.org/frs/download.php/3018/${PN}_${PV}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-db/postgresql-8.4
-	dev-libs/cyrus-sasl
-	>=dev-libs/libmemcached-0.39"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc README NEWS || die "install documentation failed"
-}
diff --git a/dev-db/pgmemcache/pgmemcache-2.1.1.ebuild b/dev-db/pgmemcache/pgmemcache-2.1.1.ebuild
deleted file mode 100644
index 1759b1a353e6..000000000000
--- a/dev-db/pgmemcache/pgmemcache-2.1.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgmemcache/pgmemcache-2.1.1.ebuild,v 1.3 2014/12/28 15:10:00 titanofold Exp $
-
-EAPI=5
-
-DESCRIPTION="A PostgreSQL API based on libmemcached to interface with memcached"
-HOMEPAGE="http://pgfoundry.org/projects/pgmemcache"
-SRC_URI="http://pgfoundry.org/frs/download.php/3018/${PN}_${PV}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-db/postgresql-8.4
-	dev-libs/cyrus-sasl
-	<dev-libs/libmemcached-1[sasl]"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
diff --git a/dev-db/sqlite/sqlite-3.8.10.2.ebuild b/dev-db/sqlite/sqlite-3.8.10.2.ebuild
index 8dd37ba945f3..5f5f8543516f 100644
--- a/dev-db/sqlite/sqlite-3.8.10.2.ebuild
+++ b/dev-db/sqlite/sqlite-3.8.10.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-db/sqlite/sqlite-3.8.10.2.ebuild,v 1.3 2015/06/26 09:04:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/sqlite/sqlite-3.8.10.2.ebuild,v 1.4 2015/06/27 06:40:07 jer 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-db/tokyocabinet/Manifest b/dev-db/tokyocabinet/Manifest
index 877cb096c58b..4836769781c0 100644
--- a/dev-db/tokyocabinet/Manifest
+++ b/dev-db/tokyocabinet/Manifest
@@ -1,3 +1 @@
-DIST tokyocabinet-1.4.46.tar.gz 1002423 SHA256 0eaaa3305cb67bd0555d228b28d842db6c6dc928dced9ad852980d82a7d933a3 SHA512 bdec41a9dc4f73421d1f304fe1c9d814b18450e1bf2b6de7d484145e7598484b08b00450eccda32b3ce03a418380e3323932c518a9994142ce6db39008eb11d6 WHIRLPOOL f79c09b6a93ae48c69b35b95b622f7c2ac4854f34ccd90a052a7bd969663833dec4ff05134fb6ee88176961761a506d9577d4d7a175bb839759a2247d9da7aa8
-DIST tokyocabinet-1.4.47.tar.gz 1002443 SHA256 a456193bac4843c0f0caa877b828c8d99dc44495511df10e1b00acf81c538594 SHA512 ccc90e2fba39a0507125a696c58ed6519b8a503e3a7433e7b34440cdccba75f6573ff8c4e3917e54c96171d459d1fb7d44afad7606d3833415fdfc63a9302a89 WHIRLPOOL 782e5dc7634581380a3088efb9c6544765d76a35a9399dd65235ba4e6c7306d13be3c7622adf5fa9577021d0ae65b22df6bbc975bf965b25052360716d43b1e2
 DIST tokyocabinet-1.4.48.tar.gz 1000485 SHA256 a003f47c39a91e22d76bc4fe68b9b3de0f38851b160bbb1ca07a4f6441de1f90 SHA512 b9995c838e713c13f781ab41062caefeb5c613f696dab08039f992f6860413d60a513114b83468cafdf7fc5b5e51ab880226972465d532f873f2a55f615e1440 WHIRLPOOL 90d47ac8858e5f4c198418c48118c0142e5bd04156088075eb0450cbc1aa7c70dde3206624c52710c46bb1a307675d536ba0d15e5ac8f4680aaf56691dd8a58e
diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.46.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.46.ebuild
deleted file mode 100644
index ac6b5af6053a..000000000000
--- a/dev-db/tokyocabinet/tokyocabinet-1.4.46.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tokyocabinet/tokyocabinet-1.4.46.ebuild,v 1.7 2011/02/26 08:22:12 xarthisius Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="A library of routines for managing a database"
-HOMEPAGE="http://fallabs.com/tokyocabinet/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="debug doc examples"
-
-DEPEND="sys-libs/zlib
-	app-arch/bzip2"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/fix_rpath.patch"
-	epatch "${FILESDIR}/${PV}.patch"
-	epatch "${FILESDIR}/remove_docinst.patch"
-}
-
-src_configure() {
-	econf $(use_enable debug) --enable-off64
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	if use examples; then
-		insinto /usr/share/${PF}/example
-		doins example/* || die "Install failed"
-	fi
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r doc/* || die "Install failed"
-	fi
-}
-
-src_test() {
-	emake -j1 check || die "Tests failed"
-}
diff --git a/dev-db/tokyocabinet/tokyocabinet-1.4.47.ebuild b/dev-db/tokyocabinet/tokyocabinet-1.4.47.ebuild
deleted file mode 100644
index 17da6c8105c8..000000000000
--- a/dev-db/tokyocabinet/tokyocabinet-1.4.47.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/tokyocabinet/tokyocabinet-1.4.47.ebuild,v 1.10 2012/04/25 16:22:24 jlec Exp $
-
-EAPI="2"
-
-inherit eutils autotools
-
-DESCRIPTION="A library of routines for managing a database"
-HOMEPAGE="http://fallabs.com/tokyocabinet/"
-SRC_URI="${HOMEPAGE}${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="debug doc examples"
-
-DEPEND="sys-libs/zlib
-	app-arch/bzip2"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/fix_rpath.patch"
-	sed -i \
-		-e "/ldconfig/d" \
-		-e "/DATADIR/d" Makefile.in || die
-	# cflags fix - remove -O2 at end of line and -fomit-frame-pointer
-	sed -i -e 's/-O3"$/"/' configure.in || die
-	sed -i -e 's/-fomit-frame-pointer//' configure.in || die
-	# flag only works on x86 derivatives, remove everywhere else
-	if ! use x86 && ! use amd64; then sed -i -e 's/ -minline-all-stringops//' configure.in; fi
-	eautoreconf
-}
-
-src_configure() {
-	# we use the "fastest" target without the -O3
-	econf $(use_enable debug) --enable-off64 --enable-fastest
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-
-	if use examples; then
-		insinto /usr/share/${PF}/example
-		doins example/* || die "Install failed"
-	fi
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins -r doc/* || die "Install failed"
-	fi
-}
-
-src_test() {
-	emake -j1 check || die "Tests failed"
-}
diff --git a/dev-embedded/gnap-ext/Manifest b/dev-embedded/gnap-ext/Manifest
index 45aae2e994f4..49e1b74e9d1d 100644
--- a/dev-embedded/gnap-ext/Manifest
+++ b/dev-embedded/gnap-ext/Manifest
@@ -1,18 +1,3 @@
-DIST gnap-basefs-1.7.1.tar.bz2 9685279 SHA256 05453599363e05b37b64992b1c976d22d29e5cbc3d0039586306126e29ef0c1c SHA512 7d71ba60ceb84d0b43128d2368364e2af679be41d14a1a97f3465469a7636507b983969a3235da68d6bdf26f58123cb2afcdfe12b6371f28b74fcce2d6ea1e93 WHIRLPOOL 5d5348581a84636278aa05377af7497823716c8512029dc86437029889ea3fad1a8bf636763fc65b55d4202cec07c72e0a57d89b1c2f02b050e3198cb60dac6b
-DIST gnap-basefs-1.7.tar.bz2 9199282 SHA256 0c0e1dded6ab6698015d48e898fe4bf87d9cfec08ea571c4103ec46632bd6ecd SHA512 944ea343b87e2ebd9c6f11c7ec4d3fa6dba2986614bf72ad45c4e49cf797872ae05321ece37e3a8d528ab8c24b8f26011bfa377c81d147d97a319ff61c8dc7d9 WHIRLPOOL 72027bc62b8695f6fa6bc3b579bc99632d48bba832d917349c388ade5f545c29ee79a331b5e9fa9775f8918e5b299458d539a839b948871d33b31b63becd4516
-DIST gnap-basefs-1.8.1.tar.bz2 9033551 SHA256 147e50d72b92db7b9bab5ea3a75770af2796cc8bcd533becca28cc33ef6df958 SHA512 6f8f49428471dde8520a44d3c47ce1ae564f37f75b59d33263c0bced8c13e99779a239dd1c702e5d3231cacf41c8a56358cf271fb1db4f792c0901306f41e090 WHIRLPOOL 8799799151410505cf3ce0fbcba794e9dadef64d9df1fe05eb9759601ffd905be9527f0fbb1e83795f0b159904f5dc045ba77c4da9901939a40ea40d2451036b
-DIST gnap-basefs-1.8.2.tar.bz2 8999026 SHA256 10358865f9b7e52948dceb7cf71868d3d9849780dd8991f550866ddfe377a7fd SHA512 fe1b41d42b2668218d7f84b56309eab527760a9ae3e2c301571c700715cb2e32be9b69f07780a97cfa753f3122a6e6c086b4ac4d9dd6032bc329cf22c7305f4c WHIRLPOOL 850eb7f6263a7e315d240dd7cc1cdac28a660fa7a220277ed5b5a7e4937cd66de8917e2a4422c5bc4f168662abacbfc8b32cbbe95d125c1c765e61b2eb524e10
-DIST gnap-basefs-1.8.tar.bz2 9027054 SHA256 864347ac5f40584e6468fe0070cacc7df2880caab78fa0cca44ab88d9cb10700 SHA512 938990e8ad81f548a075d75d79c81beab23654816f664bd5d72f643e3252a7066364f703cfdebb1a98a772f599e364bfac0adbb6659c0fc2fb2e5de54fc818ac WHIRLPOOL d4e294c5583c8abe4db2da9369ada9862e53390e809071f7cc6908c50e3765e5a317f259b9852a1152feb5575ded0332aa5c3aa99c8edc0a1ccd38aa7cbdf420
 DIST gnap-basefs-2.0.tar.bz2 8689764 SHA256 2611fb11442ced916966b7f57927114ba993bbe258e89424242bc427473acf69 SHA512 84a208197d6f5bee42f07eb1f4a02d3d64a4e938e51c7aaa503729ef40f8d7847de2563676e7a14c35fc381905b9da45e89357283060c75c997f3ff52049abeb WHIRLPOOL 49173ded09c98ddafcb25918d16f49995dc7c5062c8ec2316c070d96e9386a82b84245a591b8d06eab2f3cff745435a99f06bf7b1df11d36695ad94144e981cb
-DIST gnap-extensions-1.7.1.tar 51200 SHA256 fbeeb7d134b204d7c28ed1138edadd71a2fbd6084329089c1988f2cac1af8bbb SHA512 eb743309c22708bbdede698f8c187a3fa37ff3205ba96bcb7de052ae361261cc57c23d99b74c1ebe89a147803ac2b995277f7e784dc9568a70f841a3c39df663 WHIRLPOOL 745052c10d3b979b90c4d7831a54749b4d1bddc4b163565202b6c8676009742013f9533178bef5d6d17a09de17622c5013a851ae34ce2b5f3cd41cd1080da9c7
-DIST gnap-extensions-1.7.tar 51200 SHA256 fb3dc88a3680847cf2c331670b2cf4b1f55031a3dd29cef5e896e4550d5e3372 SHA512 b02a2749311bd0094d786da38d31aecf5a7a21bf7f88e4118894f7b45d17d1d19a7af2a84642ef7763eee6e2546e2a6e936f4044d1aeb07e750c8dadec03f611 WHIRLPOOL bc88797be487a695261dc3f5f1d851b28ca3273822c9eb2f87b21e5a2892b5e99c0be82d44dd32da6af2a99f9ab4903917f8a22a6b7da0c3838763b0d5bd5a46
-DIST gnap-extensions-1.8.1.tar 1259520 SHA256 9e5790b70d5e5fccd7f007d353b01a77d9d232eb523b765d10d4e40f26677298 SHA512 1e6e9ccc1eecee40063cb55339cf621e469c1332674bd67c639a65d767b826b73a90cbd97476776f1871dd562d5285e6b7542036b54de73d417e21b5db9012ba WHIRLPOOL 7f69750de3c04dd8a8852542587f699475a7ff7d1b0326f8dd2b1876ab44d57cae682750af3494dd8130dd91dec2dfc5c5bcb538d515acfa4943acdfbd535c9a
-DIST gnap-extensions-1.8.2.tar 1310720 SHA256 3b644b435fe11ac2491014f7f99801643fc04d83df6f77ea7355305322851e4f SHA512 9656b72e9408ce25b24912bacb783141add98eea6a742ab4830be1304206f3a345fafcdf32f3d9fb0cbc774b94fba64a55a029c7ab73f6115e7169bf579a0064 WHIRLPOOL a0f477c9d04ff183567b98a8473f2d7c100a4794f2e5060150e63b53e5c6fa44ce7892fb33c1aa91246eb80799871fd7889616569ac01f5f0a24143fc26cbc63
-DIST gnap-extensions-1.8.tar 1259520 SHA256 527fb4f49521d0d7e6d5a8bed6a7f66ed9fa575b17bf7e54f1c684ee1f17172c SHA512 b33534a7bfa3014c9d41f56a95730a81136a9fa64273fb25e41d46fe1c00f55a3351ab86580bc429a7678e559b128eaa3bcbf2f5257aec886233b7dda4cd6353 WHIRLPOOL daacba695b658131d04d73fcf024cbfd7607c436492322b748ed3a1b63e5cae3b09fe62dc3e02c2ee9937d65f6cea41f3d1251000e0b356917869a74ff8ce5b9
 DIST gnap-extensions-2.0.tar 1198080 SHA256 905bba34a307f94ff63fa9c9eac5c7fad31b15ca2471bfd47a78a59bb2028995 SHA512 08266d2b71fd1f170e9ae01fa9c0b3fa898dde7220b1b1d9828fa4bc51b08bcb5af4c7eab75eabc3b3c110ff3e24b2fd193ab36b5579b2507da1a09a90bd4044 WHIRLPOOL 731a47c321a10ee0419e3de21befc473b90cb535616ae542a82a3a6089036a8c24a83d4d243c6fb50e40c59513e5d110ed8630dc3c7ffed1015af3380e7b1cc7
-DIST gnap-tools-1.7.1.tar.bz2 24975 SHA256 d36f1b7790b460b92322f6254c2f857173b7c624505eed61b8f32168ef7867f0 SHA512 44a7d3d42b8a7ac83a346e95b6916612561901237403c82365e268f183b54eba634dcbd36ceb760762377544b0e2842855bb6c3c340d3b2cf4228b2701c3f41b WHIRLPOOL b9820c6da37c1da219e7f883c7c11ae3db84fae5273fec9c69158fe9f6e612ba20d188c7d1176166e0e638eaa58d65c089f1bfefd7a4db7862421dff6df2243d
-DIST gnap-tools-1.7.tar.bz2 24996 SHA256 2f063c58366edf9fb7e816cb3ab4c86c90c151b7c24c6fe276b46bfb4cf1769e SHA512 c84eb1489f0547a6439bf6a90e85bcc41e6f0708bfed32cc73fd310c6a6a5a2dc92317abac301ee009e881881400d660669fa770a4b6c7b21ee0a863150f281f WHIRLPOOL 4e93735b6b72d5a6b12103ddbd5600667b42f9a3eb303d96789e66608e9b27a198d95183a33cce36290f7ed2e376f55569f862f29047a1725a897ac50f03b445
-DIST gnap-tools-1.8.1.tar.bz2 25821 SHA256 6f70ec183dad7bf3b23c3d6b4e50f6f967a802c85e8eee71665bff07057ddc15 SHA512 bad2af9d3cd541a4162f87c0f54dceef6798560534e4bd1900b9dfc9c6885486d740b69043ec68f4bbd46c1e43361c13dac087db545e1430b16b0912912d08b7 WHIRLPOOL 5ba19af0881c90651c4f3a4cacb838c57400a91e8ed9580831b9686cefaf4de0434af36b35a995dd1bf2d7a9bc3ade13cad1b9b4c604cd4e819c421d16249db5
-DIST gnap-tools-1.8.2.tar.bz2 25849 SHA256 59907bb156edcb15cfdef3804112214a7785964d4e59aded49324c72d59ae777 SHA512 aae80fb7a6f985076a257b270fcbcbfd2cb5efe78140c00842e3410f29b4791aaf2050a3dfd2be5f501d1f48f3a740bf3f94f9496365412c1441d40c5df63a7b WHIRLPOOL a17e174010bc890619fd62d1252a0e714a89562dd919c5ca0e350206c8c01ebe9362befc41fae653ef34100f808715f9bc8c53869d7775b4730864df18b631e5
-DIST gnap-tools-1.8.tar.bz2 25604 SHA256 2dfa2ae0b54e4950b0c408d219c4f91018bd701b8a476a972658b3d9efb0913c SHA512 b3ab4c48ec87a21dc31978e735bb5959d12d0f7ef6b2fc9ecfc67eac09165ffb607d57e29d4e171d56be5ea6b0ccba94fb2e5b4ddb3c9b2995776f1ec9eed43c WHIRLPOOL 2894c2a764692a0230d4a24ce81ead7c8dd8ff644c90468bff18587bea467d44879b26a1c10ca1003d7b27fad2fc53ad7583e0fd89af1fa16c618102433b2cd2
 DIST gnap-tools-2.0.tar.bz2 26874 SHA256 925083618f6d19d70b0c3d4236a374ea1ea72abb1ee7999973b653751bda4a6b SHA512 cd8de371aaeee9b5dac5bebb4961855e78cd173a1de99056671e0071be2376c3fd45fb7d635786ad22f3ff413fbcd6d2b710b7c8ca4e99bdfbb09b31e7bf4b52 WHIRLPOOL eb5434a7ca3ac1f7ff5f3d2377a771e865600085d957287892eb0648cd4c3dac7101bff4e144d80197de9b4acd1455e0f59fdaead51e4a1d8a515a01ab4c5477
diff --git a/dev-embedded/gnap-ext/gnap-ext-1.7.1.ebuild b/dev-embedded/gnap-ext/gnap-ext-1.7.1.ebuild
deleted file mode 100644
index 13481cc911ac..000000000000
--- a/dev-embedded/gnap-ext/gnap-ext-1.7.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gnap-ext/gnap-ext-1.7.1.ebuild,v 1.1 2005/06/23 13:10:04 koon Exp $
-
-MY_P="${P/gnap-ext/gnap-tools}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Gentoo-based Network Appliance extensions and remastering tool"
-HOMEPAGE="http://embedded.gentoo.org/gnap.xml"
-
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-	!minimal? ( mirror://gentoo/gnap-basefs-${PV}.tar.bz2
-				mirror://gentoo/gnap-extensions-${PV}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="minimal"
-
-RDEPEND="sys-fs/squashfs-tools"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	unpack gnap-extensions-${PV}.tar
-}
-
-src_install() {
-	dobin gnap_remaster
-	doman gnap_remaster.1
-
-	dodir /usr/lib/gnap
-	insinto /usr/lib/gnap
-	if ! use minimal; then
-		newins ${DISTDIR}/gnap-basefs-${PV}.tar.bz2 gnap-basefs.tar.bz2
-	fi
-	dodir /usr/lib/gnap/extensions
-	insinto /usr/lib/gnap/extensions
-	doins ${WORKDIR}/gnapext_*.tbz2
-}
diff --git a/dev-embedded/gnap-ext/gnap-ext-1.7.ebuild b/dev-embedded/gnap-ext/gnap-ext-1.7.ebuild
deleted file mode 100644
index f01892ca7556..000000000000
--- a/dev-embedded/gnap-ext/gnap-ext-1.7.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gnap-ext/gnap-ext-1.7.ebuild,v 1.1 2005/05/31 11:29:41 koon Exp $
-
-MY_P="${P/gnap-ext/gnap-tools}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Gentoo-based Network Appliance extensions and remastering tool"
-HOMEPAGE="http://embedded.gentoo.org/gnap.xml"
-
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-	!minimal? ( mirror://gentoo/gnap-basefs-${PV}.tar.bz2
-				mirror://gentoo/gnap-extensions-${PV}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="minimal"
-
-RDEPEND="sys-fs/squashfs-tools"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	unpack gnap-extensions-${PV}.tar
-}
-
-src_install() {
-	dobin gnap_remaster
-	doman gnap_remaster.1
-
-	dodir /usr/lib/gnap
-	insinto /usr/lib/gnap
-	if ! use minimal; then
-		newins ${DISTDIR}/gnap-basefs-${PV}.tar.bz2 gnap-basefs.tar.bz2
-	fi
-	dodir /usr/lib/gnap/extensions
-	insinto /usr/lib/gnap/extensions
-	doins ${WORKDIR}/gnapext_*.tbz2
-}
diff --git a/dev-embedded/gnap-ext/gnap-ext-1.8.1.ebuild b/dev-embedded/gnap-ext/gnap-ext-1.8.1.ebuild
deleted file mode 100644
index 8dc20d70a8ca..000000000000
--- a/dev-embedded/gnap-ext/gnap-ext-1.8.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gnap-ext/gnap-ext-1.8.1.ebuild,v 1.1 2005/08/31 10:14:38 koon Exp $
-
-MY_P="${P/gnap-ext/gnap-tools}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Gentoo-based Network Appliance extensions and remastering tool"
-HOMEPAGE="http://embedded.gentoo.org/gnap.xml"
-
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-	!minimal? ( mirror://gentoo/gnap-basefs-${PV}.tar.bz2
-				mirror://gentoo/gnap-extensions-${PV}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="minimal"
-
-RDEPEND="sys-fs/squashfs-tools"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	unpack gnap-extensions-${PV}.tar
-}
-
-src_install() {
-	dobin gnap_remaster
-	doman gnap_remaster.1
-
-	dodir /usr/lib/gnap
-	insinto /usr/lib/gnap
-	if ! use minimal; then
-		newins ${DISTDIR}/gnap-basefs-${PV}.tar.bz2 gnap-basefs.tar.bz2
-	fi
-	dodir /usr/lib/gnap/extensions
-	insinto /usr/lib/gnap/extensions
-	doins ${WORKDIR}/gnapext_*.tbz2
-}
diff --git a/dev-embedded/gnap-ext/gnap-ext-1.8.2.ebuild b/dev-embedded/gnap-ext/gnap-ext-1.8.2.ebuild
deleted file mode 100644
index c8bfff5f21ca..000000000000
--- a/dev-embedded/gnap-ext/gnap-ext-1.8.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gnap-ext/gnap-ext-1.8.2.ebuild,v 1.1 2005/10/21 14:19:23 koon Exp $
-
-MY_P="${P/gnap-ext/gnap-tools}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Gentoo-based Network Appliance extensions and remastering tool"
-HOMEPAGE="http://embedded.gentoo.org/gnap.xml"
-
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-	!minimal? ( mirror://gentoo/gnap-basefs-${PV}.tar.bz2
-				mirror://gentoo/gnap-extensions-${PV}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="minimal"
-
-RDEPEND="sys-fs/squashfs-tools"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	unpack gnap-extensions-${PV}.tar
-}
-
-src_install() {
-	dobin gnap_remaster
-	doman gnap_remaster.1
-
-	dodir /usr/lib/gnap
-	insinto /usr/lib/gnap
-	if ! use minimal; then
-		newins ${DISTDIR}/gnap-basefs-${PV}.tar.bz2 gnap-basefs.tar.bz2
-	fi
-	dodir /usr/lib/gnap/extensions
-	insinto /usr/lib/gnap/extensions
-	doins ${WORKDIR}/gnapext_*.tbz2
-}
diff --git a/dev-embedded/gnap-ext/gnap-ext-1.8.ebuild b/dev-embedded/gnap-ext/gnap-ext-1.8.ebuild
deleted file mode 100644
index 5831bed32832..000000000000
--- a/dev-embedded/gnap-ext/gnap-ext-1.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/gnap-ext/gnap-ext-1.8.ebuild,v 1.1 2005/08/10 11:24:23 koon Exp $
-
-MY_P="${P/gnap-ext/gnap-tools}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Gentoo-based Network Appliance extensions and remastering tool"
-HOMEPAGE="http://embedded.gentoo.org/gnap.xml"
-
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
-	!minimal? ( mirror://gentoo/gnap-basefs-${PV}.tar.bz2
-				mirror://gentoo/gnap-extensions-${PV}.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="minimal"
-
-RDEPEND="sys-fs/squashfs-tools"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	unpack gnap-extensions-${PV}.tar
-}
-
-src_install() {
-	dobin gnap_remaster
-	doman gnap_remaster.1
-
-	dodir /usr/lib/gnap
-	insinto /usr/lib/gnap
-	if ! use minimal; then
-		newins ${DISTDIR}/gnap-basefs-${PV}.tar.bz2 gnap-basefs.tar.bz2
-	fi
-	dodir /usr/lib/gnap/extensions
-	insinto /usr/lib/gnap/extensions
-	doins ${WORKDIR}/gnapext_*.tbz2
-}
diff --git a/dev-embedded/libftdi/Manifest b/dev-embedded/libftdi/Manifest
index 8bb3d1d4c822..57bb77c638a1 100644
--- a/dev-embedded/libftdi/Manifest
+++ b/dev-embedded/libftdi/Manifest
@@ -1,5 +1,3 @@
-DIST libftdi-0.17.tar.gz 435901 SHA256 d5c0275125ab68a431375083c9544899e578b8f98b83de1254386d0209feabf0 SHA512 7a8a5d373a92ea6c814155700f12b55affa94755f8b5a72563c6abdcf0d9c2bd8607154b1198a924ed9308576fa419bb00f2c9d7f7d01b85321291fc17360513 WHIRLPOOL 2326af034e1121ad16671246bd602bb5234af831cb4d0a3c5f88e22d780b8d499b3588bd4bfb738db4589fd2d97434ba572f147c489c75bfd35e79c2c8731b03
-DIST libftdi-0.18.tar.gz 398380 SHA256 5b6f3c3ee51c6aa24d3b87135e01762cf68821d1c3599d87d349fea4ede74c62 SHA512 1e596097eef4d5cc559fc8c550d53cc2eef70185429aac27ee057c1a447486f8fccb9d84ddb11b76a57908ecdc766b2c92338d8b14f62fe11bc667ec35e1decc WHIRLPOOL e3d2b96fa3c1a303ec7f36b2ead88de6e381567639121f1b19b25a371cbbce808ca3982833522293c517d2b9717616320e72d6369e09955940054b7e8d8ca4a9
 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
diff --git a/dev-embedded/libftdi/libftdi-0.17.ebuild b/dev-embedded/libftdi/libftdi-0.17.ebuild
deleted file mode 100644
index 6dec8635c6a2..000000000000
--- a/dev-embedded/libftdi/libftdi-0.17.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/libftdi-0.17.ebuild,v 1.3 2010/06/22 20:27:28 vapier Exp $
-
-EAPI="2"
-
-DESCRIPTION="Userspace access to FTDI USB interface chips"
-HOMEPAGE="http://www.intra2net.com/en/developer/libftdi/"
-SRC_URI="http://www.intra2net.com/en/developer/libftdi/download/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="cxx doc examples python"
-
-RDEPEND="virtual/libusb:0
-	cxx? ( dev-libs/boost )
-	python? ( dev-lang/python )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	# don't bother building examples as we dont want the binaries
-	# installed and the Makefile has broken install targets
-	sed -i '/^SUBDIRS =/s:examples::' Makefile.in
-	sed -i 's:@top_buildir@:@top_builddir@:' bindings/python/setup.py.in #298607
-}
-
-src_configure() {
-	use doc || export ac_cv_path_DOXYGEN=true
-	econf \
-		$(use_enable cxx libftdipp) \
-		$(use_enable python python-binding)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-	dodoc ChangeLog README
-
-	if use doc ; then
-		doman doc/man/man3/*
-		dohtml doc/html/*
-	fi
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-}
diff --git a/dev-embedded/libftdi/libftdi-0.18.ebuild b/dev-embedded/libftdi/libftdi-0.18.ebuild
deleted file mode 100644
index 51396e6415c1..000000000000
--- a/dev-embedded/libftdi/libftdi-0.18.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-embedded/libftdi/libftdi-0.18.ebuild,v 1.2 2010/09/09 18:04:18 vapier Exp $
-
-EAPI="2"
-
-if [[ ${PV} == 9999* ]] ; then
-	EGIT_REPO_URI="git://developer.intra2net.com/libftdi"
-	inherit git autotools
-else
-	SRC_URI="http://www.intra2net.com/en/developer/libftdi/download/${P}.tar.gz"
-	KEYWORDS="amd64 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"
-
-RDEPEND="virtual/libusb:0
-	cxx? ( dev-libs/boost )
-	python? ( dev-lang/python )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	if [[ ${PV} == 9999* ]] ; then
-		mkdir -p m4
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		$(use_enable cxx libftdipp) \
-		$(use_with doc docs) \
-		$(use_with examples) \
-		$(use_enable python python-binding)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog README
-
-	if use doc ; then
-		doman doc/man/man3/*
-		dohtml doc/html/*
-	fi
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.c
-	fi
-}
diff --git a/dev-go/go-text/go-text-9999.ebuild b/dev-go/go-text/go-text-9999.ebuild
index fc209d33d62b..bcd3c6617ea8 100644
--- a/dev-go/go-text/go-text-9999.ebuild
+++ b/dev-go/go-text/go-text-9999.ebuild
@@ -1,13 +1,21 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-text/go-text-9999.ebuild,v 1.6 2015/06/25 17:43:02 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-text/go-text-9999.ebuild,v 1.7 2015/06/26 22:54:48 williamh Exp $
 
 EAPI=5
 
-inherit golang-build golang-vcs
 EGO_PN=golang.org/x/text/...
 EGO_SRC=golang.org/x/text
 
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT="df923bbb63f8ea3a26bb743e2a497abd0ab585f7"
+	SRC_URI="https://github.com/golang/text/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+fi
+inherit golang-build
+
 DESCRIPTION="Go text processing support"
 HOMEPAGE="https://godoc.org/golang.org/x/text"
 LICENSE="BSD"
@@ -16,6 +24,35 @@ IUSE=""
 DEPEND=""
 RDEPEND=""
 
+if [[ ${PV} != *9999* ]]; then
+src_unpack() {
+	local f
+
+	for f in ${A}
+	do
+		case "${f}" in
+			*.tar|*.tar.gz|*.tar.bz2|*.tar.xz)
+				local destdir=${WORKDIR}/${P}/src/${EGO_SRC}
+
+				debug-print "${FUNCNAME}: unpacking ${f} to ${destdir}"
+
+				# XXX: check whether the directory structure inside is
+				# fine? i.e. if the tarball has actually a parent dir.
+				mkdir -p "${destdir}" || die
+				tar -C "${destdir}" -x --strip-components 1 \
+					-f "${DISTDIR}/${f}" || die
+				;;
+			*)
+				debug-print "${FUNCNAME}: falling back to unpack for ${f}"
+
+				# fall back to the default method
+				unpack "${f}"
+				;;
+		esac
+	done
+}
+fi
+
 src_test() {
 	# Create a writable GOROOT in order to avoid sandbox violations.
 	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
diff --git a/dev-go/go-tools/go-tools-9999.ebuild b/dev-go/go-tools/go-tools-9999.ebuild
index 43549f2032da..e67093228d69 100644
--- a/dev-go/go-tools/go-tools-9999.ebuild
+++ b/dev-go/go-tools/go-tools-9999.ebuild
@@ -1,97 +1,118 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/go-tools-9999.ebuild,v 1.7 2015/06/09 03:17:38 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-go/go-tools/go-tools-9999.ebuild,v 1.9 2015/06/26 19:24:29 williamh Exp $
 
 EAPI=5
-inherit git-r3
+EGO_PN="golang.org/x/tools/..."
+EGO_SRC="golang.org/x/tools"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	EGIT_COMMIT="ac303766f5f240c1796eeea3dc9bf34f1261aa35"
+	ARCHIVE_URI="https://github.com/golang/tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+inherit golang-build
 
-KEYWORDS=""
 DESCRIPTION="Go Tools"
-MY_PN=${PN##*-}
-GO_PN=golang.org/x/${MY_PN}
-HOMEPAGE="https://godoc.org/${GO_PN}"
-EGIT_REPO_URI="https://go.googlesource.com/${MY_PN}"
-SRC_URI="http://golang.org/favicon.ico -> go-favicon.ico"
+HOMEPAGE="https://godoc.org/golang.org/x/tools"
+SRC_URI="${ARCHIVE_URI}
+	http://golang.org/favicon.ico -> go-favicon.ico"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
-DEPEND=">=dev-lang/go-1.4
-	dev-go/go-net"
+DEPEND="dev-go/go-net"
 RDEPEND=""
-S="${WORKDIR}/src/${GO_PN}"
-EGIT_CHECKOUT_DIR="${S}"
-STRIP_MASK="*.a"
 
+if [[ ${PV} != *9999* ]]; then
 src_unpack() {
-	git-r3_src_unpack
-	cp "${DISTDIR}"/go-favicon.ico "${S}"/godoc/static/favicon.ico || die
+	local f
+
+	for f in ${A}
+	do
+		case "${f}" in
+			*.tar|*.tar.gz|*.tar.bz2|*.tar.xz)
+				local destdir=${WORKDIR}/${P}/src/${EGO_SRC}
+
+				debug-print "${FUNCNAME}: unpacking ${f} to ${destdir}"
+
+				# XXX: check whether the directory structure inside is
+				# fine? i.e. if the tarball has actually a parent dir.
+				mkdir -p "${destdir}" || die
+				tar -C "${destdir}" -x --strip-components 1 \
+					-f "${DISTDIR}/${f}" || die
+				;;
+			*)
+				debug-print "${FUNCNAME}: falling back to unpack for ${f}"
+
+				# fall back to the default method
+				unpack "${f}"
+				;;
+		esac
+	done
 }
+fi
 
 src_prepare() {
 	# disable broken tests
-	sed -e 's:TestWeb(:_\0:' -i cmd/godoc/godoc_test.go || die
-	sed -e 's:TestVet(:_\0:' -i cmd/vet/vet_test.go || die
-	sed -e 's:TestImport(:_\0:' -i go/gcimporter/gcimporter_test.go || die
-	sed -e 's:TestImportStdLib(:_\0:' -i go/importer/import_test.go || die
-	sed -e 's:TestStdlib(:_\0:' -i go/loader/stdlib_test.go || die
-	sed -e 's:TestStdlib(:_\0:' -i go/ssa/stdlib_test.go || die
+	sed -e 's:TestWeb(:_\0:' \
+		-i src/${EGO_SRC}/cmd/godoc/godoc_test.go || die
+	sed -e 's:TestVet(:_\0:' \
+		-i src/${EGO_SRC}/cmd/vet/vet_test.go || die
+	sed -e 's:TestImport(:_\0:' \
+		-i src/${EGO_SRC}/go/gcimporter/gcimporter_test.go || die
+	sed -e 's:TestImportStdLib(:_\0:' \
+		-i src/${EGO_SRC}/go/importer/import_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-i src/${EGO_SRC}/go/loader/stdlib_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+		-i src/${EGO_SRC}/go/ssa/stdlib_test.go || die
 	sed -e 's:TestGorootTest(:_\0:' \
 		-e 's:TestFoo(:_\0:' \
 		-e 's:TestTestmainPackage(:_\0:' \
-		-i go/ssa/interp/interp_test.go || die
+		-i src/${EGO_SRC}/go/ssa/interp/interp_test.go || die
 	sed -e 's:TestBar(:_\0:' \
-		-e 's:TestFoo(:_\0:' -i go/ssa/interp/testdata/a_test.go || die
-	sed -e 's:TestCheck(:_\0:' -i go/types/check_test.go || die
+		-e 's:TestFoo(:_\0:' \
+		-i src/${EGO_SRC}/go/ssa/interp/testdata/a_test.go || die
+	sed -e 's:TestCheck(:_\0:' \
+		-i src/${EGO_SRC}/go/types/check_test.go || die
 	sed -e 's:TestStdlib(:_\0:' \
 		-e 's:TestStdFixed(:_\0:' \
-		-e 's:TestStdKen(:_\0:' -i go/types/stdlib_test.go || die
-	sed -e 's:TestRepoRootForImportPath(:_\0:' -i go/vcs/vcs_test.go || die
-	sed -e 's:TestStdlib(:_\0:' -i refactor/lexical/lexical_test.go || die
+		-e 's:TestStdKen(:_\0:' \
+		-i src/${EGO_SRC}/go/types/stdlib_test.go || die
+	sed -e 's:TestRepoRootForImportPath(:_\0:' \
+		-i src/${EGO_SRC}/go/vcs/vcs_test.go || die
+	sed -e 's:TestStdlib(:_\0:' \
+	-i src/${EGO_SRC}/refactor/lexical/lexical_test.go || die
 
 	# Add favicon to the godoc web interface (bug 551030)
-	sed -e 's:"example.html",:\0\n\t"favicon.ico",:' -i godoc/static/makestatic.go || die
-	sed -e 's:<link type="text/css":<link rel="icon" type="image/png" href="/lib/godoc/favicon.ico">\n\0:' -i \
-		godoc/static/godoc.html || die
+	cp "${DISTDIR}"/go-favicon.ico "src/${EGO_SRC}/godoc/static/favicon.ico" ||
+		die
+	sed -e 's:"example.html",:\0\n\t"favicon.ico",:' \
+		-i src/${EGO_SRC}/godoc/static/makestatic.go || die
+	sed -e 's:<link type="text/css":<link rel="icon" type="image/png" href="/lib/godoc/favicon.ico">\n\0:' \
+		-i src/${EGO_SRC}/godoc/static/godoc.html || die
 }
 
 src_compile() {
-	# Create a writable GOROOT in order to avoid sandbox violations.
-	GOROOT="${WORKDIR}/goroot"
-	cp -sR "${EPREFIX}"/usr/lib/go "${GOROOT}" || die
-	rm -rf "${GOROOT}/src/${GO_PN}" \
-		"${GOROOT}/pkg/linux_${ARCH}/${GO_PN}" || die
-
 	# Generate static.go with favicon included
-	pushd godoc/static >/dev/null
-	GOROOT="${GOROOT}" GOPATH=${WORKDIR} go run makestatic.go || die
+	pushd src/golang.org/x/tools/godoc/static >/dev/null || die
+	go run makestatic.go || die
 	popd >/dev/null
 
-	GOROOT="${GOROOT}" GOPATH=${WORKDIR} go install -v -x -work ${GO_PN}/... || die
-}
-
-src_test() {
-	GOROOT="${GOROOT}" GOPATH=${WORKDIR} \
-		go test -x -v ${GO_PN}/... || die $?
+	golang-build_src_compile
 }
 
 src_install() {
-	local x
-	exeinto /usr/lib/go/bin
-	doexe "${WORKDIR}"/bin/*
-
-	# godoc ends up in ${GOROOT}/bin
-	dodir /usr/bin
-	while read -r -d '' x; do
-		doexe "${x}"
-		ln "${ED}"usr/{lib/go/bin,bin}/${x##*/} || die
-	done < <(find "${GOROOT}/bin" -type f -print0)
+	# Create a writable GOROOT in order to avoid sandbox violations.
+	cp -sR "$(go env GOROOT)" "${T}/goroot" || die
 
-	# cover and vet end up in ${GOROOT}/pkg/tool/linux_amd64
-	exeinto /usr/lib/go/pkg/tool/linux_amd64
-	find "${GOROOT}/pkg/tool/linux_amd64" -type f -exec doexe {} \;
+	GOROOT="${T}/goroot" golang-build_src_install
+	dobin bin/* "${T}/goroot/bin/godoc"
 
-	insinto /usr/lib/go
-	find "${WORKDIR}"/{pkg,src} -name '.git*' -exec rm -rf {} \; 2>/dev/null
-	insopts -m0644 -p # preserve timestamps for bug 551486
-	doins -r "${WORKDIR}"/{pkg,src}
+	exeinto "$(go env GOTOOLDIR)"
+	exeopts -m0755 -p # preserve timestamps for bug 551486
+	doexe "${T}/goroot/pkg/tool/$(go env GOOS)_$(go env GOARCH)/cover"
+	doexe "${T}/goroot/pkg/tool/$(go env GOOS)_$(go env GOARCH)/vet"
 }
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 647d14e36f81..79f320e6ee59 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,2 +1 @@
-DIST batik-src-1.7.zip 15060504 SHA256 6bea593543a797561fa83651764e40b1b0ce01c1df21ab0359ade58e967379fd SHA512 7fee3e0d2c99e95517420c8170f68b4857fec87f69c7c55719b5e9914608900fca4c9d7d9b3e1166d678a6c844fe870a3c1051e2c1f35a2e6793a17b9087893e WHIRLPOOL 7e8f4e537d5c1d14778a8c151ff469edbc25e629c0cf99009c65a99c1dfac47d58c0bf0fa6b194bc51d8fe25ba7949f264b5d055cc22563ff50ecdd95d36daab
 DIST batik-src-1.8.tar.gz 14970684 SHA256 0f1175146d45445fc4940e214c3e1e5cfa0294ae6a9787859bda00964f97c2bd SHA512 352843fd0cec43c6d9d54426fe1c20a9bd2234798404b101f2e8d43f6089c0bf6bb5102cb5674de11d37a0d820a8bb79fe9dd854030b23fd8c68f3931eb12f1b WHIRLPOOL fa50d1f87257c6018f99076bf759066b2311f483d424ef743e45fe17c74c646a215c1211c5431b2a522913f23ff5f53934a1606d4d4a223e8298abd6ce94bb46
diff --git a/dev-java/batik/batik-1.7-r3.ebuild b/dev-java/batik/batik-1.7-r3.ebuild
deleted file mode 100644
index 82268462372e..000000000000
--- a/dev-java/batik/batik-1.7-r3.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.7-r3.ebuild,v 1.7 2015/06/22 12:03:55 monsieurp Exp $
-
-EAPI=4
-JAVA_PKG_IUSE="doc"
-inherit java-pkg-2 java-ant-2 eutils
-
-DESCRIPTION="Java based SVG toolkit"
-HOMEPAGE="http://xmlgraphics.apache.org/${PN}/"
-SRC_URI="mirror://apache/xmlgraphics/${PN}/${PN}-src-${PV}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="1.7"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc python tcl"
-
-CDEPEND="dev-java/xalan:0
-	dev-java/rhino:1.6
-	dev-java/xml-commons-external:1.3
-	python? ( dev-java/jython:0 )
-	tcl? ( dev-java/jacl:0 )
-	dev-java/ant-core"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-
-java_prepare() {
-	java-ant_ignore-system-classes
-	java-ant_rewrite-classpath contrib/rasterizertask/build.xml
-	for file in build.xml contrib/rasterizertask/build.xml; do
-		# bug #318323
-		java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v yes -a maxmemory -v 512m
-	done
-
-	cd lib
-	rm -v *.jar build/*.jar || die
-
-	java-pkg_jar-from xml-commons-external-1.3
-	java-pkg_jar-from xalan
-	java-pkg_jar-from rhino-1.6
-
-	use python && java-pkg_jar-from jython
-	use tcl && java-pkg_jar-from jacl
-}
-
-src_compile() {
-	# Fails to build on amd64 without this
-	if use amd64 ; then
-		export ANT_OPTS="-Xmx1g"
-	else
-		export ANT_OPTS="-Xmx256m"
-	fi
-
-	eant jars all-jar $(use_doc)
-	cd contrib/rasterizertask || die
-	eant -Dgentoo.classpath="$(java-pkg_getjar ant-core ant.jar):../../classes" jar $(use_doc)
-}
-
-src_install() {
-	#All-jar doesn't include ALL
-	java-pkg_dojar ${P}/${PN}-*.jar
-
-	cd ${P}/lib
-
-	# needed because batik expects this layout:
-	# batik.jar lib/*.jar
-	# there are hardcoded classpaths in the manifest :(
-	dodir /usr/share/${PN}-${SLOT}/lib/lib/
-	for jar in batik*.jar
-	do
-		java-pkg_dojar ${jar}
-		dosym ../${jar} /usr/share/${PN}-${SLOT}/lib/lib/${jar}
-	done
-
-	cd "${S}"
-	dodoc README CHANGES
-	use doc && java-pkg_dojavadoc ${P}/docs/javadoc
-
-	# pwd fixes bug #116976
-	java-pkg_dolauncher batik-${SLOT} --pwd "${EPREFIX}/usr/share/${PN}-${SLOT}/" \
-		--main org.apache.batik.apps.svgbrowser.Main
-
-	# To find these lsjar batik-${SLOT} | grep Main.class
-	for launcher in ttf2svg slideshow svgpp rasterizer; do
-		java-pkg_dolauncher batik-${launcher}-${SLOT} \
-			--main org.apache.batik.apps.${launcher}.Main
-	done
-
-	# Install and register the ant task.
-	java-pkg_dojar contrib/rasterizertask/build/lib/RasterizerTask.jar
-	java-pkg_register-ant-task
-}
diff --git a/dev-java/batik/batik-1.8.ebuild b/dev-java/batik/batik-1.8-r1.ebuild
similarity index 89%
rename from dev-java/batik/batik-1.8.ebuild
rename to dev-java/batik/batik-1.8-r1.ebuild
index bfdc50d134ea..031b4c3343ab 100644
--- a/dev-java/batik/batik-1.8.ebuild
+++ b/dev-java/batik/batik-1.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/dev-java/batik/batik-1.8.ebuild,v 1.7 2015/06/22 14:03:37 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.8-r1.ebuild,v 1.3 2015/06/28 01:45:43 monsieurp Exp $
 
 EAPI=5
 JAVA_PKG_IUSE="doc"
@@ -13,13 +13,13 @@ SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/sou
 
 LICENSE="Apache-2.0"
 SLOT="1.8"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc python tcl"
 
 CDEPEND="dev-java/xalan:0
 	dev-java/rhino:1.6
 	dev-java/xml-commons-external:1.3
-	dev-java/xmlgraphics-commons:1.5
+	dev-java/xmlgraphics-commons:2
 	python? ( dev-java/jython:0 )
 	tcl? ( dev-java/jacl:0 )
 	dev-java/ant-core:0"
@@ -29,7 +29,12 @@ RDEPEND=">=virtual/jre-1.6
 	${CDEPEND}"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="xml-commons-external-1.3,xmlgraphics-commons-1.5,xalan,rhino-1.6"
+EANT_GENTOO_CLASSPATH="
+	xml-commons-external-1.3
+	xmlgraphics-commons-2
+	xalan
+	rhino-1.6
+"
 
 java_prepare() {
 	# bug #318323
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 4db1fc577674..a8f5451b53c9 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,2 +1 @@
-DIST fop-0.95-src.zip 15153053 SHA256 690e4dd4a4b6fdf5b18469bf6768115fb5d444c3253bba47e69b0079a739e32a SHA512 8b40796cc0c5038197a01b4dbdef1efe6158954fe3486658a554113ad2a54196e8eb6530844669cb18ef948cd859b5ec4221fb299a19b537892f15cb01054e79 WHIRLPOOL dced6b252073622cf1ee92d216da280a2f67164779b45a1125ff65a7d856e2cb688b5623edd27742ad68cda0ead1758b8acd473ae2ef196bb469bd3c597f8c3a
-DIST fop-1.1-src.zip 27577477 SHA256 0886058bcb076899d9c46f65491eaa9b7144c1c632425feb29fbbc30194ccddb SHA512 bda305b0b94c02bca3a39130080b13fd1391d8ef84f6e9b31adf7279fb9434a65910c51b146b5e0844cff921c0fd2a5786f7e479b29f59cc4c729c2f50bb37a1 WHIRLPOOL 1ddb58d0e822a18ad78c4140d45e9773819a73f9e2a0d8d39026a717ceaed3c60c308cb041e33ed8dbd9ffd2bb6ccdd29d1413eeb312150266c5ad9cf094176f
+DIST fop-2.0-src.zip 26381859 SHA256 70da9622ce25891d989b8ab25692738c5dd6eb2de6ee9b9300d5487f0378d2ec SHA512 428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a WHIRLPOOL cfd0ec06fba6fe089fb0bea803668e8c89f80eddd198efda20573274ea0cfa750248f12b50827ab89571a4923f51b307d241ff0a4f236cf4a6e28ea49c8d1ac7
diff --git a/dev-java/fop/fop-0.95.ebuild b/dev-java/fop/fop-0.95.ebuild
deleted file mode 100644
index a49985f556d8..000000000000
--- a/dev-java/fop/fop-0.95.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-0.95.ebuild,v 1.7 2012/10/18 08:40:33 ottxor Exp $
-
-# TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot
-#       be built as it needs forrest which we do not have
-# TODO: package and use optional dependency jeuclid
-
-EAPI=4
-JAVA_PKG_IUSE="doc examples source"
-WANT_ANT_TASKS="ant-trax"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
-HOMEPAGE="http://xmlgraphics.apache.org/fop/"
-SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
-LICENSE="Apache-2.0"
-SLOT="0"
-# doesn't work with java.awt.headless
-RESTRICT="test"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="hyphenation jai jimi"
-
-COMMON_DEPEND="
-	dev-java/avalon-framework:4.2
-	dev-java/batik:1.7
-	dev-java/commons-io:1
-	dev-java/commons-logging:0
-	java-virtuals/servlet-api:2.2
-	dev-java/xmlgraphics-commons:1.3
-	dev-java/xml-commons-external:1.3
-	dev-java/xalan:0
-	jai? ( dev-java/sun-jai-bin )
-	jimi? ( dev-java/sun-jimi )"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.4
-	hyphenation? ( dev-java/offo-hyphenation )
-	app-arch/unzip
-	${COMMON_DEPEND}"
-#	test? (
-#		=dev-java/junit-3.8*
-#		dev-java/xmlunit
-#	)"
-
-java_prepare() {
-	# automagic is bad
-	java-ant_ignore-system-classes || die
-
-	cd "${S}/lib"
-	rm -v *.jar || die
-
-	java-pkg_jarfrom --build-only ant-core ant.jar
-	java-pkg_jarfrom avalon-framework-4.2 avalon-framework.jar \
-		avalon-framework-4.2.0.jar
-	java-pkg_jarfrom batik-1.7
-	java-pkg_jarfrom commons-io-1 commons-io.jar commons-io-1.3.1.jar
-	java-pkg_jarfrom commons-logging commons-logging.jar \
-		commons-logging-1.0.4.jar
-	java-pkg_jarfrom --virtual servlet-api-2.2 servlet.jar servlet-2.2.jar
-	java-pkg_jarfrom xmlgraphics-commons-1.3
-	java-pkg_jarfrom xalan xalan.jar xalan-2.7.0.jar
-	java-pkg_jarfrom xml-commons-external-1.3
-
-	use jai && java-pkg_jar-from sun-jai-bin
-	use jimi && java-pkg_jar-from sun-jimi
-}
-
-EANT_DOC_TARGET="javadocs"
-EANT_BUILD_TARGET="package"
-
-src_compile() {
-	# because I killed the automagic tests; all our JDK's have JCE
-	local af="-Djdk14.present=true -Djce.present=true"
-	use hyphenation && af="${af} -Duser.hyph.dir=${EPREFIX}/usr/share/offo-hyphenation/hyph/"
-	use jai && af="${af} -Djai.present=true"
-	use jimi && af="${af} -Djimi.present=true"
-
-	export ANT_OPTS="-Xmx256m"
-	java-pkg-2_src_compile ${af} -Djavahome.jdk14="${JAVA_HOME}"
-}
-
-src_test() {
-	java-pkg_jar-from --into lib xmlunit-1
-	java-pkg_jar-from --into lib junit
-
-	ANT_OPTS="-Xmx1g -Djava.awt.headless=true" eant -Djunit.fork=off junit
-}
-
-src_install() {
-	java-pkg_dojar build/fop.jar build/fop-sandbox.jar
-	if use hyphenation; then
-		java-pkg_dojar build/fop-hyph.jar
-		insinto /usr/share/${PN}/
-		doins -r hyph
-	fi
-
-	# doesn't support everything upstream launcher does...
-	java-pkg_dolauncher ${PN} --main org.apache.fop.cli.Main
-
-	dodoc NOTICE README
-
-	use doc && java-pkg_dojavadoc build/javadocs
-	use examples && java-pkg_doexamples examples/* conf
-	use source && java-pkg_dosrc src/java/org src/sandbox/org
-}
-
-pkg_postinst(){
-	elog "The SVG Renderer and the MIF Handler have not been resurrected"
-	elog "They are currently non-functional."
-	elog
-	elog "The API of FOP has changed considerably and is not backwards-compatible"
-	elog "with versions 0.20.5 and 0.91beta. Version 0.92 introduced the new"
-	elog "stable API."
-}
diff --git a/dev-java/fop/fop-1.1.ebuild b/dev-java/fop/fop-1.1.ebuild
deleted file mode 100644
index 03a41b6fae30..000000000000
--- a/dev-java/fop/fop-1.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-1.1.ebuild,v 1.2 2014/08/10 20:13:16 slyfox Exp $
-
-# TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot
-#       be built as it needs forrest which we do not have
-# TODO: package and use optional dependency jeuclid
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-WANT_ANT_TASKS="ant-trax"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
-HOMEPAGE="http://xmlgraphics.apache.org/fop/"
-SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
-
-KEYWORDS="~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="hyphenation jai"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# Doesn't work with java.awt.headless, requires Mockito.
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-java/avalon-framework:4.2
-	dev-java/batik:1.7
-	dev-java/commons-io:1
-	dev-java/commons-logging:0
-	java-virtuals/servlet-api:2.2
-	dev-java/xmlgraphics-commons:1.5
-	dev-java/xml-commons-external:1.3
-	dev-java/ant-core:0
-	jai? ( dev-java/sun-jai-bin )"
-
-RDEPEND=">=virtual/jre-1.5
-	${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.5
-	dev-java/qdox:1.12
-	hyphenation? ( dev-java/offo-hyphenation )
-	app-arch/unzip
-	${COMMON_DEPEND}
-	test? (
-		dev-java/junit:4
-		dev-java/xmlunit
-	)"
-
-java_prepare() {
-	find "${S}" -name '*.jar' -print -delete || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_DOC_TARGET="javadocs"
-EANT_BUILD_TARGET="package"
-EANT_GENTOO_CLASSPATH="ant-core,avalon-framework-4.2,batik-1.7,servlet-api-2.2,commons-io-1,commons-logging,xmlgraphics-commons-1.5,xml-commons-external-1.3"
-EANT_EXTRA_ARGS="-Djce.present=true"
-EANT_DOC_TARGET="javadocs"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-EANT_TEST_TARGET="junit"
-EANT_TEST_EXTRA_ARGS="-Djunit.present=true -Dxmlunit.present=true"
-
-src_compile() {
-	EANT_GENTOO_CLASSPATH_EXTRA+="$(java-pkg_getjars --build-only qdox-1.12)"
-
-	use jai && EANT_EXTRA_ARGS+=" -Djai.present=true" && EANT_GENTOO_CLASSPATH+=",sun-jai-bin"
-	use hyphenation && EANT_EXTRA_ARGS+=" -Dhyphenation.present=true -Duser.hyph.dir=${EPREFIX}/usr/share/offo-hyphenation/hyph/"
-
-	java-pkg-2_src_compile
-}
-
-src_test() {
-	ANT_TASKS="ant-junit" java-pkg-2_src_test
-}
-
-src_install() {
-	java-pkg_dojar build/fop.jar build/fop-sandbox.jar
-
-	if use hyphenation ; then
-		java-pkg_dojar build/fop-hyph.jar
-		insinto /usr/share/${PN}/
-		doins -r hyph
-	fi
-
-	# Doesn't support everything upstream launcher does...
-	java-pkg_dolauncher ${PN} --main org.apache.fop.cli.Main
-
-	dodoc NOTICE README
-
-	use doc && java-pkg_dojavadoc build/javadocs
-	use examples && java-pkg_doexamples examples/* conf
-	use source && java-pkg_dosrc src/java/org src/sandbox/org
-}
diff --git a/dev-java/fop/fop-2.0.ebuild b/dev-java/fop/fop-2.0.ebuild
new file mode 100644
index 000000000000..1a156e6bb880
--- /dev/null
+++ b/dev-java/fop/fop-2.0.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.7 2015/06/27 21:28:33 monsieurp Exp $
+
+# TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot
+#       be built as it needs forrest which we do not have
+# TODO: package and use optional dependency jeuclid
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
+HOMEPAGE="http://xmlgraphics.apache.org/fop/"
+SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
+
+KEYWORDS="amd64 x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="hyphenation jai"
+LICENSE="Apache-2.0"
+SLOT="2"
+
+MY_P="${PN}-${SLOT}"
+
+# Doesn't work with java.awt.headless, requires Mockito.
+RESTRICT="test"
+
+CDEPEND="
+	dev-java/batik:1.8
+	dev-java/ant-core:0
+	dev-java/fontbox:1.7
+	dev-java/commons-io:1
+	dev-java/commons-logging:0
+	java-virtuals/servlet-api:3.0
+	dev-java/avalon-framework:4.2
+	dev-java/xmlgraphics-commons:2
+	dev-java/xml-commons-external:1.3
+	jai? ( dev-java/sun-jai-bin:0 )"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	dev-java/qdox:1.12
+	hyphenation? ( dev-java/offo-hyphenation:0 )
+	app-arch/unzip
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+		dev-java/xmlunit:1
+		dev-java/mockito:0
+	)"
+
+java_prepare() {
+	find "${S}" -name '*.jar' -print -delete || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_DOC_TARGET="javadocs"
+EANT_BUILD_TARGET="package"
+EANT_GENTOO_CLASSPATH="
+	ant-core
+	batik-1.8
+	fontbox-1.7
+	commons-io-1
+	commons-logging
+	servlet-api-3.0
+	avalon-framework-4.2
+	xmlgraphics-commons-2
+	xml-commons-external-1.3
+"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}
+	mockito
+	junit-4
+	xmlunit-1
+"
+
+EANT_EXTRA_ARGS="-Djce.present=true"
+EANT_DOC_TARGET="javadocs"
+EANT_TEST_TARGET="junit"
+#EANT_TEST_EXTRA_ARGS="-Djunit.present=true -Dxmlunit.present=true"
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+="$(java-pkg_getjars --build-only qdox-1.12)"
+
+	if use jai; then
+		EANT_EXTRA_ARGS+=" -Djai.present=true"
+		EANT_GENTOO_CLASSPATH+=" sun-jai-bin"
+	fi
+
+	if use hyphenation; then
+		EANT_EXTRA_ARGS+=" -Dhyphenation.present=true -Duser.hyph.dir=${EPREFIX}/usr/share/offo-hyphenation/hyph/"
+	fi
+
+	java-pkg-2_src_compile
+}
+
+# Tests are broken even in 2.0
+src_test() {
+	EANT_ANT_TASKS="ant-junit" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar build/fop.jar build/fop-sandbox.jar
+
+	if use hyphenation; then
+		java-pkg_dojar build/fop-hyph.jar
+		insinto /usr/share/${MY_P}/
+		doins -r hyph
+	fi
+
+	# Doesn't support everything upstream launcher does...
+	java-pkg_dolauncher ${MY_P} --main org.apache.fop.cli.Main
+
+	dodoc NOTICE README
+
+	if use doc; then
+		java-pkg_dojavadoc \
+			build/javadocs
+	fi
+
+	if use examples; then
+		java-pkg_doexamples \
+			examples/* conf
+	fi
+
+	if use source; then
+		java-pkg_dosrc \
+			src/java/org \
+			src/sandbox/org
+	fi
+}
diff --git a/dev-java/fop/metadata.xml b/dev-java/fop/metadata.xml
index 9b49028d473b..610a741524d6 100644
--- a/dev-java/fop/metadata.xml
+++ b/dev-java/fop/metadata.xml
@@ -5,6 +5,5 @@
   <use>
     <flag name="hyphenation">Precompile hyphenation patterns from the <pkg>dev-java/offo-hyphenation</pkg> package and install them as fop-hyph.jar</flag>
     <flag name="jai">Enable jai support</flag>
-    <flag name="jimi">Enable jimi support</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-java/httpcomponents-client/metadata.xml b/dev-java/httpcomponents-client/metadata.xml
index 85dddeaa406d..7303cef96964 100644
--- a/dev-java/httpcomponents-client/metadata.xml
+++ b/dev-java/httpcomponents-client/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
-	<use>
-		<flag name="deprecated">Build deprecated classes</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-java/httpcomponents-core/metadata.xml b/dev-java/httpcomponents-core/metadata.xml
index 85dddeaa406d..7303cef96964 100644
--- a/dev-java/httpcomponents-core/metadata.xml
+++ b/dev-java/httpcomponents-core/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
-	<use>
-		<flag name="deprecated">Build deprecated classes</flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-java/jcharts/jcharts-0.7.5-r2.ebuild b/dev-java/jcharts/jcharts-0.7.5-r3.ebuild
similarity index 69%
rename from dev-java/jcharts/jcharts-0.7.5-r2.ebuild
rename to dev-java/jcharts/jcharts-0.7.5-r3.ebuild
index 5d45dff337b1..0afbcf34ddb0 100644
--- a/dev-java/jcharts/jcharts-0.7.5-r2.ebuild
+++ b/dev-java/jcharts/jcharts-0.7.5-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jcharts/jcharts-0.7.5-r2.ebuild,v 1.4 2013/11/11 23:16:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jcharts/jcharts-0.7.5-r3.ebuild,v 1.3 2015/06/27 17:53:34 ago Exp $
 
-EAPI="4"
+EAPI="5"
 
 JAVA_PKG_IUSE="doc examples source"
 
@@ -21,15 +21,20 @@ IUSE=""
 # tests need X11
 RESTRICT=test
 
-# depends on com.sun.image.codec.jpeg which was removed in java 1.7 #180437
-COMMON_DEP="
-	dev-java/batik:1.7
+CDEPEND="dev-java/batik:1.8
 	java-virtuals/servlet-api:3.0"
-RDEPEND="${COMMON_DEP}
+
+RDEPEND="${CDEPEND}
 	|| ( virtual/jre:1.6 virtual/jre:1.5 )"
-DEPEND="${COMMON_DEP}
-	|| ( virtual/jdk:1.6 virtual/jdk:1.5 virtual/jdk:1.4 )
-	app-arch/unzip"
+
+DEPEND="${CDEPEND}
+	|| ( virtual/jdk:1.6 virtual/jdk:1.5 virtual/jdk:1.4 )"
+
+#RDEPEND="${CDEPEND}
+#	>=virtual/jre-1.4"
+#DEPEND="${CDEPEND}
+#	>=virtual/jdk-1.4
+#	app-arch/unzip"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -41,12 +46,15 @@ JAVA_ANT_REWRITE_CLASSPATH="yes"
 JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
 
 EANT_BUILD_XML="build/build.xml"
-EANT_GENTOO_CLASSPATH="batik-1.7,servlet-api-3.0"
 EANT_DOC_TARGET="javadocs"
+EANT_GENTOO_CLASSPATH="
+	batik-1.8
+	servlet-api-3.0
+"
 
-#src_test() {
-#	java-pkg-2_src_test
-#}
+src_test() {
+	java-pkg-2_src_test
+}
 
 src_install() {
 	java-pkg_newjar build/*.jar
diff --git a/dev-java/jflex/jflex-1.6.0.ebuild b/dev-java/jflex/jflex-1.6.0.ebuild
index 8ce0b3c89589..b77360fa8c32 100644
--- a/dev-java/jflex/jflex-1.6.0.ebuild
+++ b/dev-java/jflex/jflex-1.6.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-java/jflex/jflex-1.6.0.ebuild,v 1.2 2015/02/22 18:55:39 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jflex/jflex-1.6.0.ebuild,v 1.3 2015/06/28 02:01:07 monsieurp Exp $
 
 EAPI="5"
 
@@ -14,16 +14,18 @@ SRC_URI="http://${PN}.de/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos"
+
+CDEPEND="dev-java/ant-core:0
+	>=dev-java/javacup-0.11a_beta20060608:0
+	dev-java/junit:0"
 
 RDEPEND=">=virtual/jre-1.5
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-	>=dev-java/ant-core-1.7.0
-	>=dev-java/javacup-0.11a_beta20060608:0"
+	${CDEPEND}"
 
 DEPEND=">=virtual/jdk-1.5
-	dev-java/junit:0
-	>=dev-java/javacup-0.11a_beta20060608:0"
+	${CDEPEND}"
 
 IUSE="${JAVA_PKG_IUSE} source vim-syntax"
 
diff --git a/dev-java/jython/files/jython-2.7.0-build.xml.patch b/dev-java/jython/files/jython-2.7.0-build.xml.patch
new file mode 100644
index 000000000000..4e27af771eb4
--- /dev/null
+++ b/dev-java/jython/files/jython-2.7.0-build.xml.patch
@@ -0,0 +1,11 @@
+--- build.xml.orig	2015-06-27 16:12:08.442000000 +0000
++++ build.xml	2015-06-27 16:12:15.684000000 +0000
+@@ -448,7 +448,7 @@
+     </target>
+ 
+     <target name="antlr_gen" depends="prepare-output" unless="antlr.notneeded">
+-        <java classname="org.antlr.Tool" failonerror="true" fork="true" dir="${jython.base.dir}">
++        <java classname="org.antlr.Tool" failonerror="false" fork="true" dir="${jython.base.dir}">
+             <jvmarg value="-Xmx512m"/>
+             <arg value="-Xconversiontimeout"/>
+             <arg value="2000"/>
diff --git a/dev-java/jython/jython-2.7.0.ebuild b/dev-java/jython/jython-2.7.0.ebuild
index 31a70dae0f5b..75459c8f2778 100644
--- a/dev-java/jython/jython-2.7.0.ebuild
+++ b/dev-java/jython/jython-2.7.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-java/jython/jython-2.7.0.ebuild,v 1.2 2015/06/13 18:04:56 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.7.0.ebuild,v 1.3 2015/06/27 18:15:35 monsieurp Exp $
 
 EAPI=5
 JAVA_PKG_IUSE="doc examples source"
@@ -28,7 +28,6 @@ CDEPEND="dev-java/ant-core:0
 	dev-java/guava:13
 	>=dev-java/java-config-2.1.11-r3
 	dev-java/jffi:1.2
-	dev-java/jline:0
 	dev-java/jline:2
 	dev-java/icu4j:52
 	dev-java/jnr-constants:0
@@ -54,9 +53,10 @@ S=${WORKDIR}
 RESTRICT="test"
 
 JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_GENTOO_CLASSPATH="asm-4,commons-compress,guava-13,jffi-1.2,jline-2,jnr-constants"
-EANT_GENTOO_CLASSPATH+=",script-api,servlet-api-3.0,stringtemplate,xerces-2"
-EANT_GENTOO_CLASSPATH+=",icu4j-52,netty-transport,jnr-posix-3.0"
+EANT_GENTOO_CLASSPATH="asm-4,commons-compress,guava-13,jffi-1.2,jline-2,"
+EANT_GENTOO_CLASSPATH+="jnr-constants,script-api,servlet-api-3.0,"
+EANT_GENTOO_CLASSPATH+="stringtemplate,xerces-2,icu4j-52,netty-transport,jnr-posix-3.0"
+
 JAVA_ANT_CLASSPATH_TAGS+=" java"
 
 EANT_BUILD_TARGET="developer-build"
@@ -73,6 +73,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.7_beta1-ant.patch
 	"${FILESDIR}"/${PN}-2.7_beta1-dont-always-recompile-classes.patch
 	"${FILESDIR}"/${PN}-2.7_beta2-maxrepeat-import.patch
+	"${FILESDIR}"/${PN}-2.7.0-build.xml.patch
 )
 
 java_prepare() {
@@ -105,6 +106,8 @@ src_compile() {
 	java-pkg-2_src_compile
 }
 
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+
 src_test() {
 	java-pkg-2_src_test
 }
@@ -122,7 +125,7 @@ src_install() {
 
 	dodoc ACKNOWLEDGMENTS NEWS README.txt
 
-	use doc && java-pkg_dojavadoc dist/Doc/javadoc
+	use doc && java-pkg_dohtml -r dist/Doc/javadoc
 	use source && java-pkg_dosrc src/*
 	use examples && java-pkg_doexamples Demo/*
 
diff --git a/dev-java/mockito/mockito-1.9.5-r1.ebuild b/dev-java/mockito/mockito-1.9.5-r1.ebuild
index 52cf5024ab35..738380b8fab6 100644
--- a/dev-java/mockito/mockito-1.9.5-r1.ebuild
+++ b/dev-java/mockito/mockito-1.9.5-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-java/mockito/mockito-1.9.5-r1.ebuild,v 1.3 2015/06/23 15:25:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mockito/mockito-1.9.5-r1.ebuild,v 1.4 2015/06/27 21:27:48 monsieurp Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~ppc ~ppc64"
 
 IUSE=""
 
diff --git a/dev-java/objenesis/objenesis-1.3.ebuild b/dev-java/objenesis/objenesis-1.3.ebuild
index 09072d63b21b..478bda75c892 100644
--- a/dev-java/objenesis/objenesis-1.3.ebuild
+++ b/dev-java/objenesis/objenesis-1.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-java/objenesis/objenesis-1.3.ebuild,v 1.4 2015/06/23 15:25:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/objenesis/objenesis-1.3.ebuild,v 1.5 2015/06/27 21:27:49 monsieurp Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}-bin.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 x86 ~ppc ~ppc64"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.5"
diff --git a/dev-java/wstx/wstx-3.2.9.ebuild b/dev-java/wstx/wstx-3.2.9.ebuild
index 1071e3c4a2ea..7f4bf07602c2 100644
--- a/dev-java/wstx/wstx-3.2.9.ebuild
+++ b/dev-java/wstx/wstx-3.2.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/wstx/wstx-3.2.9.ebuild,v 1.1 2013/07/09 15:34:03 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/wstx/wstx-3.2.9.ebuild,v 1.3 2015/06/28 10:16:44 zlogene Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ SRC_URI="http://woodstox.codehaus.org/${PV}/${PN}-src-${PV}.zip"
 
 LICENSE="Apache-2.0"
 SLOT="3.2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 
 COMMON_DEP="
 	dev-java/emma:0
diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
index bbb44a2200ef..c166ff5d98e2 100644
--- a/dev-java/xmlgraphics-commons/Manifest
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -1,3 +1 @@
-DIST xmlgraphics-commons-1.2-src.tar.gz 430083 SHA256 1588fe182e62d3f3cf7c2acb7d0989b7134b94c95580256e4fe1b9c5e3a38663 SHA512 20bb9ac9287266371bdeaf8db7c4310c8df2f8aca9c63c295eaa463d391553f2de23cea50fe794520bfbb00e7283ee2debba2b0279ed1f317e001e69f54fed78 WHIRLPOOL abfb690dde0b078591a85c09dc2b1e0d7db6c5b814a26d54d35bdc7a3f3f06f16ba946ce3070944b06f933f5d3295477124ce5ce55260b58c1c550c8b0be38f1
-DIST xmlgraphics-commons-1.3.1-src.tar.gz 751502 SHA256 1dd2acfe892af34196d5365addd8e106dd355a2b4bead5f44feea4edcfc452b1 SHA512 0c2b2b8db4c54d50f65bb6915319f531e2ea4bac93cf95a4a9caec17a22a103a2919688135e6b2d3f110db9206d61ceb8a6735602fbf99faedd40b971539b589 WHIRLPOOL cb94ef4f0fca609ba2e92f20e74cd6edcae4fcc092bbb4dd482af522354813c79216a750e0c2157349713f9c9295d2dbf35bfb58de6c755deb4ee11af6c36c1a
-DIST xmlgraphics-commons-1.5-src.tar.gz 2597097 SHA256 f73322f1fafdcf5391d0411a377ac6c566e17536daf64b29f1370d6e718d0867 SHA512 af120dab18972f32e1b23f8bed1a9c519d7e2bcebd9c32fa77db61394f31a5821d909ddfe0e9a27cda7fcdf44966cf2576a94fc7c9af047f66c4081b8c35f398 WHIRLPOOL 043d57d08945713e3a14c28274551ac8cd76890f09b52ff1774f6201619792dddbcd827e55680a72b8bb711060ee6d6d270056846f53e35aaee2506052a52eb4
+DIST xmlgraphics-commons-2.0.1-src.tar.gz 2716982 SHA256 41938d4b27cb80b0ef9a240164e2137e51708d2f481488e5ae8c4e43c8da311c SHA512 fca5c593ceec18b040a0a57b74ba5377d5e070030f48b7835285986382795b19072bdf6320fd7e37182e4127883b795249ee1cb4255bcdfb1b00da1cf6032018 WHIRLPOOL 81554e5eab606378af8a536a3a630bf3ba041609d16b8fa49a41361d701658aec3131a3947b53341b4f99145f6701a4125b8e38b1a802eca5a16c8bfd5984e36
diff --git a/dev-java/xmlgraphics-commons/files/xmlgraphics-commons-1.5-disable-iccprofile-test.patch b/dev-java/xmlgraphics-commons/files/xmlgraphics-commons-1.5-disable-iccprofile-test.patch
deleted file mode 100644
index 6d226e6e1f8f..000000000000
--- a/dev-java/xmlgraphics-commons/files/xmlgraphics-commons-1.5-disable-iccprofile-test.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: This test fails with openjdk-7 (and oracle java 7).
- Skip for the time being until upstream resolve - see Bug.
-Author: James Page <james.page@ubuntu.com>
-Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=53328
-
-Index: xmlgraphics-commons/test/java/org/apache/xmlgraphics/image/loader/ImageLoaderTestCase.java
-===================================================================
---- xmlgraphics-commons.orig/test/java/org/apache/xmlgraphics/image/loader/ImageLoaderTestCase.java	2012-05-30 17:12:37.000324000 +0100
-+++ xmlgraphics-commons/test/java/org/apache/xmlgraphics/image/loader/ImageLoaderTestCase.java	2012-05-30 17:13:03.184417043 +0100
-@@ -159,28 +159,6 @@
-         sessionContext.checkAllStreamsClosed();
-     }
- 
--    public void testICCProfiles() throws Exception {
--        MyImageSessionContext sessionContext = createImageSessionContext();
--        List/* <ICC_Profile> */profiles = new ArrayList();
--
--        runReaders(profiles, sessionContext, "iccTest.png", "image/png",
--                ImageFlavor.RAW_PNG);
--        runReaders(profiles, sessionContext, "iccTest.jpg", "image/jpeg",
--                ImageFlavor.RAW_JPEG);
--
--        ICC_Profile first = (ICC_Profile) profiles.get(0);
--        byte[] firstData = first.getData();
--        for (int i = 1; i < profiles.size(); i++) {
--            ICC_Profile icc = (ICC_Profile) profiles.get(i);
--            byte[] data = icc.getData();
--            assertEquals("Embedded ICC Profiles are not the same size!",
--                    firstData.length, data.length);
--            for (int j = 0; j < firstData.length; j++) {
--                assertEquals("Embedded ICC Profiles differ at index " + j,
--                        firstData[j], data[j]);
--            }
--        }
--    }
-     
-     private void runReaders(List profiles, ImageSessionContext isc, String uri,
-             String mime, ImageFlavor rawFlavor) throws Exception {
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.2-r1.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.2-r1.ebuild
deleted file mode 100644
index 16038901755d..000000000000
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.2-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.2-r1.ebuild,v 1.2 2014/08/10 20:27:30 slyfox Exp $
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A library of several reusable components used by Apache Batik and Apache FOP"
-HOMEPAGE="http://xmlgraphics.apache.org/commons/index.html"
-SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="jpeg"
-
-# fails connect to X even tho it sets java.awt.headless
-RESTRICT="test"
-CDEPEND=">=dev-java/commons-io-1"
-DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
-		jpeg? (
-			|| (
-				>=dev-java/blackdown-jdk-1.4
-				=dev-java/icedtea-bin-1*
-				>=dev-java/ibm-jdk-bin-1.4
-				>=dev-java/jrockit-jdk-bin-1.4
-				dev-java/icedtea
-				>=dev-java/apple-jdk-bin-1.4
-			)
-		)
-		test? (
-			dev-java/ant-junit
-		)
-		${CDEPEND}"
-RDEPEND=">=virtual/jre-1.4
-		${CDEPEND}"
-
-# TODO investigate producing .net libraries
-# stratigies for non sun jdk's/jre's
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	if use jpeg && java-pkg_current-vm-matches kaffe; then
-		eerror "Sun-private JPEG support cannot be built with kaffe."
-		eerror "Please set your build VM to Sun, Blackdown, IBM or JRockit JDK."
-		eerror "See http://www.gentoo.org/doc/en/java.xml for details."
-		eerror "Alternatively, install this package with USE=-jpeg"
-		die "Cannot build with USE=jpeg and kaffe."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# automagic bad
-	java-ant_ignore-system-classes || die
-
-	cd "${S}/lib" || die
-	rm -v *.jar || die
-
-	java-pkg_jarfrom commons-io-1
-}
-
-src_compile() {
-	local af="-Djdk14.present=true"
-	use jpeg && af="${af} -Dsun.jpeg.present=true"
-	eant ${af} jar-main $(use_doc javadocs)
-}
-
-src_test() {
-	java-pkg_jarfrom --into lib junit
-	# probably needs ${af} from src_compile, doesn't work anyway
-	ANT_TASKS="ant-junit" eant -Djunit.present=true junit
-}
-
-src_install(){
-	java-pkg_newjar build/${P}.jar
-	use source && java-pkg_dosrc src/java/org src/java-1.4/org
-	use doc && java-pkg_dojavadoc build/javadocs
-}
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild
deleted file mode 100644
index b7bbd5c3696e..000000000000
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild,v 1.8 2014/08/10 20:27:30 slyfox Exp $
-
-EAPI=1
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A library of several reusable components used by Apache Batik and Apache FOP"
-HOMEPAGE="http://xmlgraphics.apache.org/commons/index.html"
-SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.3"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="jpeg"
-
-# fails connect to X even tho it sets java.awt.headless
-RESTRICT="test"
-CDEPEND="dev-java/commons-io:1
-	 >=dev-java/commons-logging-1:0"
-DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
-		test? (
-			dev-java/ant-junit
-		)
-		${CDEPEND}"
-RDEPEND=">=virtual/jre-1.4
-		${CDEPEND}"
-
-# TODO investigate producing .net libraries
-# stratigies for non sun jdk's/jre's
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-
-	if use jpeg && java-pkg_current-vm-matches kaffe; then
-		eerror "Sun-private JPEG support cannot be built with kaffe."
-		eerror "Please set your build VM to Sun, Blackdown, IBM or JRockit JDK."
-		eerror "See http://www.gentoo.org/doc/en/java.xml for details."
-		eerror "Alternatively, install this package with USE=-jpeg"
-		die "Cannot build with USE=jpeg and kaffe."
-	fi
-}
-
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	rm -v "${S}"/lib/*.jar || die
-}
-
-EANT_GENTOO_CLASSPATH="commons-io-1,commons-logging"
-EANT_EXTRA_ARGS="-Djdk14.present=true"
-EANT_BUILD_TARGET="jar-main"
-EANT_DOC_TARGET="javadocs"
-
-src_compile() {
-	java-pkg-2_src_compile $(use jpeg && echo -Dsun.jpeg.present=true)
-}
-
-src_test() {
-	java-pkg_jarfrom --into lib junit
-	# probably needs ${af} from src_compile, doesn't work anyway
-	ANT_TASKS="ant-junit" eant -Djunit.present=true junit
-}
-
-src_install(){
-	java-pkg_newjar build/${P}.jar
-	use source && java-pkg_dosrc src/java/org
-	use doc && java-pkg_dojavadoc build/javadocs
-}
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.5.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.5.ebuild
deleted file mode 100644
index 97e61b045e2d..000000000000
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.5.ebuild,v 1.6 2015/06/22 08:24:01 ago Exp $
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-VIRTUALX_REQUIRED="manual"
-VIRTUALX_COMMAND="eant"
-
-inherit java-pkg-2 java-ant-2 virtualx
-
-DESCRIPTION="A library of several reusable components used by Apache Batik and Apache FOP"
-HOMEPAGE="http://xmlgraphics.apache.org/commons/index.html"
-SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.5"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-
-CDEPEND="dev-java/commons-io:1
-	>=dev-java/commons-logging-1:0"
-
-DEPEND=">=virtual/jdk-1.5
-		test? ( dev-java/ant-junit4 )
-		${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.5
-		${CDEPEND}"
-
-# Strategies for non sun jdk's/jre's
-
-JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-java_prepare() {
-	# See https://issues.apache.org/bugzilla/show_bug.cgi?id=53328
-	epatch "${FILESDIR}"/${P}-disable-iccprofile-test.patch
-
-	find "${S}" -name '*.jar' -print -delete || die
-
-	rm -v test/java/org/apache/xmlgraphics/java2d/ps/PSGraphics2DTestCase.java || die
-}
-
-EANT_GENTOO_CLASSPATH="commons-io-1,commons-logging"
-EANT_EXTRA_ARGS="-Djdk15.present=true"
-EANT_BUILD_TARGET="jar-main"
-EANT_DOC_TARGET="javadocs"
-
-src_test() {
-	java-pkg_jarfrom --into lib junit-4,commons-io-1
-
-	ANT_TASKS="ant-junit4" virtualmake -Djdk15.present=true junit
-}
-
-src_install(){
-	java-pkg_newjar build/${P}.jar
-
-	use source && java-pkg_dosrc src/java/org
-	use doc && java-pkg_dojavadoc build/javadocs
-}
-
-# TODO: Investigate producing .net libraries.
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild
new file mode 100644
index 000000000000..73b57bc83639
--- /dev/null
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild,v 1.4 2015/06/27 21:28:22 monsieurp Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A library of several reusable components used by Apache Batik and Apache FOP"
+HOMEPAGE="http://xmlgraphics.apache.org/commons/index.html"
+SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+KEYWORDS="amd64 x86 ~ppc ~ppc64"
+
+CDEPEND="dev-java/commons-io:1
+	>=dev-java/commons-logging-1:0"
+
+DEPEND=">=virtual/jdk-1.6
+	test? (
+		dev-java/mockito:0
+		dev-java/ant-junit:0
+		dev-java/xml-commons-resolver:0
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+		${CDEPEND}"
+
+java_prepare() {
+	find "${S}" -name '*.jar' -print -delete || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_BUILD_TARGET="jar-main"
+EANT_DOC_TARGET="javadocs"
+
+EANT_GENTOO_CLASSPATH="
+	commons-io-1
+	commons-logging
+"
+
+EANT_TEST_GENTOO_CLASSPATH="
+	${EANT_GENTOO_CLASSPATH}
+	xml-commons-resolver
+	mockito
+"
+
+EANT_TEST_TARGET="junit-basic"
+
+src_test() {
+	EANT_ANT_TASKS="ant-junit" \
+		java-pkg-2_src_test
+}
+
+src_install(){
+	java-pkg_newjar build/${P}.jar
+
+	use source && java-pkg_dosrc src/java/org
+	use doc && java-pkg_dojavadoc build/javadocs
+}
diff --git a/dev-java/xmlunit/Manifest b/dev-java/xmlunit/Manifest
index 340ebb705ea6..9df220f0cd5f 100644
--- a/dev-java/xmlunit/Manifest
+++ b/dev-java/xmlunit/Manifest
@@ -1,2 +1,3 @@
 DIST xmlunit-1.3-src.zip 836670 SHA256 fe5ff18925a4b07a70d939a1211fed2c021496ac6bedaacff884c29c8d01b42f SHA512 51f38df1fb7d146777bc5d99c9861157c1b97c1c89bddd1d04649c5ebe73af307db3113733e1ee8517468455683287d8d9ff2ce3dd714ff39b09d02649d3e890 WHIRLPOOL 9756973c61280df339494121a0eb6f2f0f8c026223df94a7bbdb818175277cf446d88bb8c888914ceb575ef2834116252437864f8f4fe797a915fa6e44ef515c
 DIST xmlunit-1.4-src.zip 816904 SHA256 a849cff7531a80b5d1992596df647cedb537ecadeb7f640adac8e20f65880163 SHA512 1534729fe93a6beacd3961998c0c548eb15f54ee184740d9df2b3160bd69da4b299a2a98fd43eab5f1e7ce0cd8645ac1040c6f7e1007c2c4d90babb25136d381 WHIRLPOOL ae7b97557cfa1d3c1c54d0af343005cafe673e8554ba965aaef9525715696ecf811c46eb31364450aa033c2d3f2ad5e5258cbb9364fa3338997ea6f08ec06517
+DIST xmlunit-1.6-src.zip 830899 SHA256 d3aeb0c9737c1184e7c70bb1f8eb986dc449c03f09f6d3c65406d51a7f879c8c SHA512 a7d15905d959ab5bfeb1807c80eab3e0aa58d501a2136335961da842b9571b95b4aab18189e9a21e59afac960ea83f9a2d32e3af398f63c0f839587b60b9f96b WHIRLPOOL 0cd507e5564e7d426385bcffb6cc0305a13fcf7e70699994789d23c5a91c0c0bb52c79b372eb5e07e37e08b791aa71b8cea1ccc801f2153d5af9793c1c3a8cec
diff --git a/dev-java/xmlunit/xmlunit-1.6.ebuild b/dev-java/xmlunit/xmlunit-1.6.ebuild
new file mode 100644
index 000000000000..77a9913679be
--- /dev/null
+++ b/dev-java/xmlunit/xmlunit-1.6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlunit/xmlunit-1.6.ebuild,v 1.2 2015/06/27 21:15:12 monsieurp Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="XMLUnit extends JUnit and NUnit to enable unit testing of XML"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+HOMEPAGE="http://xmlunit.sourceforge.net/"
+
+LICENSE="BSD"
+SLOT="1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+CDEPEND="dev-java/junit:0"
+
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip:0
+	doc? ( app-text/docbook-xsl-stylesheets:0 )
+	test? (
+		dev-java/ant-junit:0
+		dev-java/ant-trax:0
+	)
+	${CDEPEND}"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="junit"
+
+EANT_DOC_TARGET="users-guide-html javadocs"
+EANT_ANT_TASKS="ant-trax"
+EANT_EXTRA_ARGS="-Ddb5.xsl=/usr/share/sgml/docbook/xsl-stylesheets"
+
+src_test() {
+	ANT_TASKS="ant-junit ant-trax" eant test
+}
+
+src_install() {
+	java-pkg_newjar "build/lib/${P}.jar"
+
+	dodoc README.txt
+
+	if use doc; then
+		java-pkg_dojavadoc build/doc/api
+		dohtml build/doc/userguide/html/*
+	fi
+
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-lang/luajit/luajit-2.0.3-r1.ebuild b/dev-lang/luajit/luajit-2.0.3-r1.ebuild
index e16ef17b2d09..4dabd1f4abe8 100644
--- a/dev-lang/luajit/luajit-2.0.3-r1.ebuild
+++ b/dev-lang/luajit/luajit-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/dev-lang/luajit/luajit-2.0.3-r1.ebuild,v 1.2 2015/06/11 19:17:08 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/luajit/luajit-2.0.3-r1.ebuild,v 1.4 2015/06/27 12:41:48 zlogene Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ SRC_URI="http://luajit.org/download/${MY_P}.tar.gz
 LICENSE="MIT"
 # this should probably be pkgmoved to 2.0 for sake of consistency.
 SLOT="2"
-KEYWORDS="~amd64 arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~ppc x86 ~amd64-linux ~x86-linux"
 IUSE="lua52compat"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index df3ea4a25f2a..43bf01a3bfff 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -2,13 +2,11 @@ DIST pl-6.6.6.tar.gz 14838653 SHA256 9f80bb274e2f31fd68b0acbe35982c012d5f8311dbe
 DIST swi-prolog-6.6.6-gentoo-patchset-0.tar.gz 1590 SHA256 2b240d15562603120e0314bb69bde50089326c11876b7a62106c05f9d48ace71 SHA512 807c7e897dd5b9eef14e063ea53c03047f3acb23174a70a613258adf7f85dc1f7637158fde70aab2e0f40de4bc6ac5e3548dd09dbe3745d916a388f43eb832eb WHIRLPOOL 0a0dbc361cfbe343c8b3562a2c0535905eb1443eea0783b14f96bda43c04e8db6264f476c07da766c6936dc6088e34059f799a3244717390644bf0f5ae83018e
 DIST swi-prolog-7.2.0-gentoo-patchset-0.tar.gz 1629 SHA256 b41a9c416ea0976c1a5f49d6d10090fa8ac41a6fe82982410fec0f09e73e09f0 SHA512 35449b56aa671ca937b2ee0e40ab7b19cd5a1b68277084a22c06c9e00f1318ab4d6603993b4aa44e9a6d8ab1418661a4d409160b93db04b7ca6e7c199831348e WHIRLPOOL 8a46b84865a2da2f315bf877cc1e464b59abc2891a91a5ee20530af39b353127c9d5ffabc4dea076137d619354dff259524ca28f0d4407c165be08e1b5c6fd38
 DIST swi-prolog-7.2.1-gentoo-patchset-0.tar.gz 1636 SHA256 b8aa8cda2e5903341e4f51187a4901d810ad3b4c03db514315fbf1dea671b924 SHA512 839ebe9ceaf010198edd36a8bd19eccfaba779e95b83a1908f1532d16eb650656758de68ee70195057e4c975d76aff46b2ca3f5c3f93e1698355227678148510 WHIRLPOOL efe93a16272ab99c6dc1bfaedabaddaef389c8c07d34f3ee5af1d417612601c85a39c56ce5b0d7ca167a84537277fcab76290f3fb2427e4b30ff7911d79f8d2d
-DIST swi-prolog-7.3.0-gentoo-patchset-0.tar.gz 1891 SHA256 18c107c0f8f7473762254514c25e1cb0edf84b2aff5d79ef14dde5f2719d6a1a SHA512 b56e9fd33d495f83128d0f39ff31a5e783c11da2f7e0ed00e98284d7c86ccc88c22c0a6d43a5620870d14ac26aa4aee638bc0d4246bda104ce3b7d73ee2e678d WHIRLPOOL f2f5910215f355791b964d19227f16f0f296e4a129fe904c558e878368556e04ee5996be7e9d7eba66300cc3b661ad819f96842bf6f511cf9abdd24399f168d2
-DIST swi-prolog-7.3.1-gentoo-patchset-0.tar.gz 1627 SHA256 eb043742ed8d7cd0f8a0da39ed537fe7f07c6cf12130126ce2724b2b356f116e SHA512 1bdc3f3424b4f077fabab465a9f4b6dff49170664256430cc60106abb52d6d227928ff3d219c60c708c728e5cd587c37f0cc42b7ad500ce840abf7cf48eee384 WHIRLPOOL e409cc85d19c8d68f2afa35820fe3f429d49555de8607426491bf21a95083600c5465765e17eb6d6b28d9819f730780c12566b671b4a87e648c90bc43997e04e
+DIST swi-prolog-7.2.2-gentoo-patchset-0.tar.gz 1414 SHA256 145f585828da45d89c6abebb7707ef224334a6e102dd50302b1af549d8d8a3c8 SHA512 32642e5e133971fbcec777791c050dd548545050353e23e08e0457487d3b5ec46e9491be4cdfb8d0a0a8af613dc64b569969aaa31a0d8691e0c3fdd9b5c645d0 WHIRLPOOL f394d4da284e31e4f431cda1af54d3dd4f2995bf04de985750c7b0f89f2ad6ed2fca8c921ffe711ae83b8f0d478c864bf81b531a9fe71ab9be73df20083e5c21
 DIST swi-prolog-7.3.2-gentoo-patchset-0.tar.gz 1628 SHA256 0c019e7bb12d6c81aab94f5940577bc354f6283933da9975d1bedad76582ffea SHA512 66d87771af1c205e79210fe5e41a057b600d5910c0d413adf84147a10664e7f0caa18939f8707e810563785ce932423581f8b4c312f72174d12c76a7e8194d9b WHIRLPOOL 857a1f702bb26e0b1efcb8e1f5d7351216e253f1260d0a4652489074d0d4716452f3fd0b970f9c26cea3e1c9af26d0029284c644c523d081404f451d5d1e9e2b
 DIST swi-prolog-7.3.3-gentoo-patchset-0.tar.gz 1401 SHA256 d8c65ac2c3f7b6681d270741d23e56c30ecc249199efff385cbf20daa94f56c9 SHA512 55c9d84a1bf16720c32488a73b0250a426ce1d4f17853051a939a217a24126bf357bbc9407a8ce7537656b9848f09409e709116d158272c25b4e95cf4ced6c90 WHIRLPOOL bc21bca3e9943946838afb9961fe45f1b12b92a79a92f34eaf46e1d6aaef43c35cb0f1acf7145225aca8b3b975ff59ace289990fb4012bdb7ef93afe59af6c58
 DIST swipl-7.2.0.tar.gz 16211509 SHA256 801423b8293d08b96b575ffa96d91cce3acf2473f04c23d58657dd668287f8cb SHA512 94c89e7f76ff545821e2e984a630d37863f305fe71f0cc79a3fd4e41e1b69f4a74f924a4f429d054480b2dd030ceba5fc65fefb75933cf19aeb18c0a03863bf6 WHIRLPOOL 815d1a900a501ad8d9cb843bd42bf1756f1d5c70d994637960c7849140b3ab414b26da06c85998870027ec27678050a68d3480bb81ed23978be9e10e7920e631
 DIST swipl-7.2.1.tar.gz 16175699 SHA256 f81bd713c5a7544f9b2af694cc0e74aaaf7a70e0a67203caab6ee9493e1dd01f SHA512 514d89963a7b6cae2e33cb01a2b67cb7ec6fd0dbfa7010608b87a3207626f04cd57ce71f816d10be9ac0266d0f2d243f773fc0bd46b37caf04fc2435748d96be WHIRLPOOL ba396ec4465d9ebdf14efea44fa958d655c87b14af201421a6ac88db17bb46391129f0a9ce9a29229457b0f940892a126f6ee55285dbf0ba9395ed01066585ff
-DIST swipl-7.3.0.tar.gz 16202647 SHA256 c2b66b1ffc2ba84a63159720ec920f75e45730148f8ec0e3535e523a473a3566 SHA512 4d6b332234e425dc2f69f24440316fbbaa44cdd4160b9a5d59e2d719c6b9d7e5074d834e3beccdfa1e6c4d802f8632b03a7346919850259e612696df543c2454 WHIRLPOOL 5f6655c5924236c7bd946dc6cf66ef55f21809029c58af9e2e5866bae71a5a4f10d48f7ee3a8fef893171908f69f89c929f805e0ceba7f4d14454acb0cae06d6
-DIST swipl-7.3.1.tar.gz 16212749 SHA256 9a62b048f604af710c03a2055e3382c84c9f2c342c6fb8fa257332ede6763062 SHA512 152f1162ce8397b26387140f76e57036956f0de9841e8c543f59cefb86b50b66e2d90284f22b1249d2be6d8a0b9bedbddda96b2c54f0181ae82085ec883a39cc WHIRLPOOL 274ca1e0ab623461b07278927115707e4fca94d1246efe8d376feb735b07b0938c9c6e46745fa8cb7188fdd28f5f7e824f39f8b6f209df07bf5407079c70c29e
+DIST swipl-7.2.2.tar.gz 16179490 SHA256 c137bbe1d652a6aaa003278045e592637cd9fd5f1d52b05f9f0751bfd9449c8d SHA512 b25ed01e49628d9b463acd0e3687eaef0e3f74e8f834a1442e66913fabf948ae6f6d662c21e3cbb1ca5793ceb96701be31c3b1d2d3a0a9694ea4706f9a64939e WHIRLPOOL 1309284a4d610cb37196aca678d4823bba384ba04a84ef1212c3580bad40da3359fbe4035a13cbfdd21a4eca75df2b8a3c398a1da9061a71ba8da8276c2b17dd
 DIST swipl-7.3.2.tar.gz 16172495 SHA256 8d8a503b1f36a8635afb7614219d64f4a2f43052bc589de2adbe7f995ec6cc6e SHA512 e74c3fa7e29ea2a4121a839c8d77229913c94367077affb991ae7543ec2da84feef724376a9f47c880ad131b1f43a8f7905722f382b7aab4d6f2f268056ae2c3 WHIRLPOOL 78104539d3210a8296e45ff48b13dcbf958ead19909331b4edb78722915d9ae87af959917f3ebcc62b888f44632c38dfbc59e0bae02128b7f6fa6946a3a5fe72
 DIST swipl-7.3.3.tar.gz 16178897 SHA256 fbdb14d4b780f210feb9a3656fb8fabcc2f8aa95d172b1cf2847189e2bd7df6f SHA512 bfe66e0bf12f9c0e044f5af6feccc1b26bde43e0e182f8252e8ec6be09eae96dfc9f1b0517149a1539fd76920f797017ab9550545578edfa3f6d7db4e823801d WHIRLPOOL b307d3c8b6a25216b1411c1bea2e1f3e6fa509cd911496efd0bae473be88df4f0ae5e1929cf3dded01e34583536ecae11806ea5be69e5383f1ef74178eb5761d
diff --git a/dev-lang/swi-prolog/swi-prolog-7.3.0.ebuild b/dev-lang/swi-prolog/swi-prolog-7.2.2.ebuild
similarity index 95%
rename from dev-lang/swi-prolog/swi-prolog-7.3.0.ebuild
rename to dev-lang/swi-prolog/swi-prolog-7.2.2.ebuild
index 25ae785d1b3e..a5b5499cc7a9 100644
--- a/dev-lang/swi-prolog/swi-prolog-7.3.0.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-7.2.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-lang/swi-prolog/swi-prolog-7.3.0.ebuild,v 1.1 2015/05/16 14:47:41 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-7.2.2.ebuild,v 1.1 2015/06/27 12:19:07 keri Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ PATCHSET_VER="0"
 
 DESCRIPTION="free, small, and standard compliant Prolog compiler"
 HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz
+SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz
 	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-lang/swi-prolog/swi-prolog-7.3.1.ebuild b/dev-lang/swi-prolog/swi-prolog-7.3.1.ebuild
deleted file mode 100644
index e8fc7046703a..000000000000
--- a/dev-lang/swi-prolog/swi-prolog-7.3.1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-7.3.1.ebuild,v 1.1 2015/06/13 08:52:23 keri Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic java-pkg-opt-2 multilib
-
-PATCHSET_VER="0"
-
-DESCRIPTION="free, small, and standard compliant Prolog compiler"
-HOMEPAGE="http://www.swi-prolog.org/"
-SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz
-	mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X"
-
-RDEPEND="sys-libs/ncurses
-	archive? ( app-arch/libarchive )
-	zlib? ( sys-libs/zlib )
-	odbc? ( dev-db/unixODBC )
-	readline? ( sys-libs/readline )
-	gmp? ( dev-libs/gmp )
-	ssl? ( dev-libs/openssl )
-	java? ( >=virtual/jdk-1.5 )
-	X? (
-		virtual/jpeg
-		x11-libs/libX11
-		x11-libs/libXft
-		x11-libs/libXpm
-		x11-libs/libXt
-		x11-libs/libICE
-		x11-libs/libSM )"
-
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-	java? ( test? ( =dev-java/junit-3.8* ) )"
-
-S="${WORKDIR}/swipl-${PV}"
-
-src_prepare() {
-	EPATCH_FORCE=yes
-	EPATCH_SUFFIX=patch
-	epatch "${WORKDIR}"/${PV}
-
-	# OSX/Intel ld doesn't like an archive without table of contents
-	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-	use ppc && append-flags -mno-altivec
-	use hardened && append-flags -fno-unit-at-a-time
-	use debug && append-flags -DO_DEBUG
-
-	# ARCH is used in the configure script to figure out host and target
-	# specific stuff
-	export ARCH=${CHOST}
-
-	export CC_FOR_BUILD=$(tc-getBUILD_CC)
-
-	cd "${S}"/src || die
-	econf \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_enable gmp) \
-		$(use_enable readline) \
-		$(use_enable static-libs static) \
-		--enable-shared \
-		--enable-custom-flags COFLAGS="${CFLAGS}"
-
-	if ! use minimal ; then
-		local jpltestconf
-		if use java && use test ; then
-			jpltestconf="--with-junit=$(java-config --classpath junit)"
-		fi
-
-		cd "${S}/packages" || die
-		econf \
-			--libdir="${EPREFIX}"/usr/$(get_libdir) \
-			$(use_with archive) \
-			$(use_with java jpl) \
-			${jpltestconf} \
-			$(use_with odbc) \
-			$(use_with ssl) \
-			$(use_with X xpce) \
-			$(use_with zlib) \
-			COFLAGS='"${CFLAGS}"'
-	fi
-}
-
-src_compile() {
-	cd "${S}"/src || die
-	emake
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_test() {
-	cd "${S}/src" || die
-	emake check
-
-	if ! use minimal ; then
-		cd "${S}/packages" || die
-		emake check
-		./report-failed || die "Cannot report failed packages"
-	fi
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-
-	if ! use minimal ; then
-		emake -C packages DESTDIR="${D}" install
-		if use doc ; then
-			emake -C packages DESTDIR="${D}" html-install
-		fi
-		./packages/report-failed || die "Cannot report failed packages"
-	fi
-
-	dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
-}
diff --git a/dev-libs/granite/Manifest b/dev-libs/granite/Manifest
index b407fd41a965..dc10ebeed1e8 100644
--- a/dev-libs/granite/Manifest
+++ b/dev-libs/granite/Manifest
@@ -1,3 +1,4 @@
 DIST granite-0.1.0.tar.gz 92385 SHA256 8eb552f6fd086779b44d08a7a5283928801e6b0db8c54144b9286f9c89ca02f6 SHA512 06733870c2ea9d16e4bdb8aec9984b81d27de9aa8958d8b213fe31aad36675a8dadda9513271d63473e7d243e7b760aaa75ed6ad745f9214b394f23425f41f90 WHIRLPOOL 38cbddf7ef1c80bd907db512d43be68f920debc830fea853b1b793754f47182266d39b4a3c9da7aeecde3992dd1225cc7e2a25f775091184fd21f130346fd605
 DIST granite-0.2.1.tar.gz 146871 SHA256 4e9a97488c04b2c3eadcb4b8251c8938a9637820b1989449e55490f42a2ac92c SHA512 a9cbe43e836c1e5430260bb8643b63b6712c17a60c184ed7105a9e96eb68e8107c09de655f58262a1dcab85cfb59beb18352b49a5ddb0817f9aff7b86d1e2bb1 WHIRLPOOL 6d909976300fa32c16b127b0865f7c8b064230407c496653627aa63b1d24ff4197fa3894d93f9ea9d349a85c26ad0b94e7836bfe6fa15aa0deafa1e5b28d51df
 DIST granite-0.2.3.1.tgz 152607 SHA256 56f05338bb7967f0b912d35bf780a3ddd68b517e1939371a14a5f79581a8f80d SHA512 c4db7d3a9e65178fa961761355fdf4d3795513a5a8d0ba5a448761336817a0de027382421a86213b434449f257f3c869b6275357acb732b6dd382cf5ea86eca8 WHIRLPOOL b7287c7f5ab0c1213b8ea3dc8512375c133244a3d838e612d42c59d3c9694164c03a40a464e210a3b5771399afff0b24f2b054e61fb76fd636443f7804833caa
+DIST granite-0.3.0.tar.gz 285072 SHA256 df950dd79749213971d50316c68edadf1fb3c2151cb7d63f6a6b9edf12084ad1 SHA512 3ebbb7453b770f8b5b98cee0f96db8443d7583af0117b2d34c9daa82bf36d25418e0fcf61118e7551ced91e751d8b032998dc9cca2569e61c7227666c4383872 WHIRLPOOL ebf2130fc97b3d896b868ef2fb37ea3952b0e2630b872a05930ee52f8bc9fb656382cceb7cdbf201e91267b99ab6485777ea2880305ad9e32c79f4af7865f875
diff --git a/dev-libs/granite/files/granite-0.3.0-build-fix.patch b/dev-libs/granite/files/granite-0.3.0-build-fix.patch
new file mode 100644
index 000000000000..f93a3c65df33
--- /dev/null
+++ b/dev-libs/granite/files/granite-0.3.0-build-fix.patch
@@ -0,0 +1,22 @@
+=== modified file 'lib/Widgets/ContractorView.vala'
+--- lib/Widgets/ContractorView.vala	2014-09-04 12:39:00 +0000
++++ lib/Widgets/ContractorView.vala	2015-03-23 05:21:46 +0000
+@@ -35,7 +35,7 @@
+     public delegate void ContractCallback ();
+     private Gee.HashMap<int, DelegateWrapper?> outsiders;
+     private int[] blacklisted_pos;
+-    private ListStore list;
++    private Gtk.ListStore list;
+ 
+     private struct DelegateWrapper { unowned ContractCallback method; }
+     
+@@ -73,7 +73,7 @@
+      */
+     public ContractorView (string filename, string mime, int icon_size = 32, bool show_contract_name = true) {
+         /* Setup the ListStore */
+-        list = new ListStore (2, typeof (Gdk.Pixbuf), typeof (string));
++        list = new Gtk.ListStore (2, typeof (Gdk.Pixbuf), typeof (string));
+         outsiders = new Gee.HashMap<int, DelegateWrapper?> ();
+         this.model = list;
+         
+
diff --git a/dev-libs/granite/files/granite-0.3.0-build-fix2.patch b/dev-libs/granite/files/granite-0.3.0-build-fix2.patch
new file mode 100644
index 000000000000..7c6bcb9236e5
--- /dev/null
+++ b/dev-libs/granite/files/granite-0.3.0-build-fix2.patch
@@ -0,0 +1,13 @@
+=== modified file 'lib/Widgets/DynamicNotebook.vala'
+--- lib/Widgets/DynamicNotebook.vala	2014-08-30 13:28:37 +0000
++++ lib/Widgets/DynamicNotebook.vala	2014-09-23 13:43:11 +0000
+@@ -941,7 +941,7 @@
+             notebook.create_window.connect (on_create_window);
+         }
+ 
+-        ~Notebook () {
++        ~DynamicNotebook () {
+             notebook.switch_page.disconnect (on_switch_page);
+             notebook.page_added.disconnect (on_page_added);
+             notebook.page_removed.disconnect (on_page_removed);
+
diff --git a/dev-libs/granite/files/granite-0.3.0-build-fix3.patch b/dev-libs/granite/files/granite-0.3.0-build-fix3.patch
new file mode 100644
index 000000000000..145d552c7a04
--- /dev/null
+++ b/dev-libs/granite/files/granite-0.3.0-build-fix3.patch
@@ -0,0 +1,24 @@
+=== modified file 'lib/Widgets/DynamicNotebook.vala'
+--- lib/Widgets/DynamicNotebook.vala	2014-07-31 12:41:52 +0000
++++ lib/Widgets/DynamicNotebook.vala	2014-08-30 13:28:37 +0000
+@@ -658,10 +658,19 @@
+        /**
+         * The text shown in the add button tooltip
+         */
++#if VALA_0_26
++        public string add_button_tooltip {
++            get { _add_button_tooltip = add_button.tooltip_text; return _add_button_tooltip; }
++            set { add_button.tooltip_text = value; }
++        }
++        // Use temporary field to avoid breaking API this can be dropped while preparing for 0.4
++        string _add_button_tooltip;
++#else
+         public string add_button_tooltip {
+             get { return add_button.tooltip_text; }
+             set { add_button.tooltip_text = value; }
+         }
++#endif
+ 
+         public Tab current {
+             get { return tabs.nth_data (notebook.get_current_page ()); }
+
diff --git a/dev-libs/granite/granite-0.3.0.ebuild b/dev-libs/granite/granite-0.3.0.ebuild
new file mode 100644
index 000000000000..d87780629fd4
--- /dev/null
+++ b/dev-libs/granite/granite-0.3.0.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-libs/granite/granite-0.3.0.ebuild,v 1.1 2015/06/26 17:03:00 pacho Exp $
+
+EAPI=5
+VALA_MIN_API_VERSION="0.24"
+
+inherit cmake-utils gnome2-utils multilib vala versionator
+
+DESCRIPTION="A development library for elementary development"
+HOMEPAGE="http://launchpad.net/granite"
+SRC_URI="http://launchpad.net/${PN}/$(get_version_component_range 1-2)/$(get_version_component_range 1-2)/+download/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	dev-libs/gobject-introspection:=
+	dev-libs/libgee:0.8[introspection]
+	>=x11-libs/gtk+-3.11.6:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS )
+PATCHES=(
+	# https://bugs.launchpad.net/granite/+bug/1453526
+	"${FILESDIR}"/${P}-build-fix{,2,3}.patch
+)
+
+src_prepare() {
+	vala_src_prepare
+	sed -i -e "/NAMES/s:valac:${VALAC}:" cmake/FindVala.cmake || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DLIB_INSTALL_DIR=$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	HTML_DOCS=( doc/. )
+	cmake-utils_src_install
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/dev-libs/libunistring/libunistring-0.9.5.ebuild b/dev-libs/libunistring/libunistring-0.9.5.ebuild
index d3d31f90e096..7c4d85b72f11 100644
--- a/dev-libs/libunistring/libunistring-0.9.5.ebuild
+++ b/dev-libs/libunistring/libunistring-0.9.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/libunistring/libunistring-0.9.5.ebuild,v 1.1 2015/06/08 21:22:41 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libunistring/libunistring-0.9.5.ebuild,v 1.2 2015/06/26 14:29:34 ago Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3 GPL-3"
 SLOT="0/2"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux"
 IUSE="doc static-libs"
 
 src_prepare() {
diff --git a/dev-libs/m17n-lib/Manifest b/dev-libs/m17n-lib/Manifest
index 3c446d7bc999..e72555f26c53 100644
--- a/dev-libs/m17n-lib/Manifest
+++ b/dev-libs/m17n-lib/Manifest
@@ -1,6 +1,4 @@
 DIST m17n-lib-1.5.2.tar.gz 997592 SHA256 389cc05194e9a1f9e58b186c3fcd60d7fee2a6f627c3ea8f9c944d69983721f1 SHA512 899959ad7d6b32b7ec0a97eca5abf2a3a4e9d44d81b5157bc974b17544db4e59550bc04b0b2d46371dc57f64c7e0aa70ebb7d473ade3a762f40acf19ac19b072 WHIRLPOOL 9483d3fcc97aad78b44dd228e8c800e5147cc7c7758e72b87e4875960abe0f8d5b34ab669ec858da4d1792c1c3b58dc3669f4ced9bf8f151924f0d44dbf7b3e0
-DIST m17n-lib-1.5.3.tar.gz 998339 SHA256 8ad62dbb9643f2f3c1d85cc61a12371c364c10f0e498920491e8b54f96fe6627 SHA512 3aa0232e5fcb7986718875f98248056a91c20509dc3745484edd1e357c1992cb91a94a86497d04e88e20589d737c0c92ac327f87b57ec41f9bff08cafabd42f9 WHIRLPOOL 608c04881b735cd29d520f2cf464c7cde8c9fad871c994da37e036fc2667e102bf0df74bff9a34c7b54b5329978d1b77bfe26a5635c03de8617409d16f8eb093
-DIST m17n-lib-1.5.4.tar.gz 962454 SHA256 4cc9bf22c4a53255bccacbe90c71e54cb6aa78e394144e5ffce3aa1640ce51e7 SHA512 8a0a350acb12abf71fc3641dab14a3a5d8e5afc09c71fda0508ded0d989ba835ad467ab4ef3460150e3aaee8ad5c84f55d31e2e1b1514703e3918504e6dca3f0 WHIRLPOOL c039401579dbc70c1b954198c9c32cc335b032a56b93ff34eb9fb196ff5391d41a5127583c3c0cdbbb377ea038081f620eae2fbfa294b0016d434ad2184f96b6
 DIST m17n-lib-1.5.5.tar.gz 954476 SHA256 300ef0411fc306f8b409c0688c85ee9804ddc4b3ac643a84abe4aeec0a6f912f SHA512 e294d65c1b0894ab631fe34852e1193d8ad7dd4798aede2ffb1723538f242ab6ec21a015ae45aadc398541ff1be264655abe602aeb9598d03d8dd45af1c91aeb WHIRLPOOL 103b0aaf9aadee2148c1880a2b0c5e2b0725a42864cead3709ee44184157eb82693b9ba0a5c38a00cbf63712adb58f24e1d64bc22008c2fa1632282548fbe22e
 DIST m17n-lib-1.6.2.tar.gz 1031508 SHA256 f15039a310e94d6b462c46c409a393e1b16d95f13fd0376361f07bbfc6adb5a3 SHA512 ade2d468861042b63494e5ae49e82d813f30c45fea5d1a9377681dfd06a66b3aa3e2db5112b70e760ca5d4aedaa7f846e28e0ed8e37565d6a05f94f145b2b2ce WHIRLPOOL 52ac678b10b14999af6c3f6b1e88fb583dc996d9bb5be34c084fff3270eabb3a18c56c079d0f287fe922acee97b40d04e5005660b8fdc0d4a12f329b7879b2cc
 DIST m17n-lib-1.6.3.tar.gz 1033048 SHA256 ff5ebe09572a5e6d4a376783a78d4355f0b17a71fbaf8b01978230be7eef735e SHA512 66177e5be17e330230d31bfff8a3cc7415ad79f9bfaf8f4c4baea02f1f19bf2d3628210c697a9b14d07dcb9bac8ca256e6c5102cbaae65876bf49aa2150cfd80 WHIRLPOOL ac337d68c4cfd0f9c331ded71a16c4d86f2d4c655a59f17da92fc8a80ed6f420af97ceb2ff071d556aaee0cf73baae9736faed32aaa58538d59a44f27a981c53
diff --git a/dev-libs/m17n-lib/m17n-lib-1.5.3.ebuild b/dev-libs/m17n-lib/m17n-lib-1.5.3.ebuild
deleted file mode 100644
index c613549ceb6a..000000000000
--- a/dev-libs/m17n-lib/m17n-lib-1.5.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/m17n-lib-1.5.3.ebuild,v 1.5 2012/12/03 07:13:23 naota Exp $
-
-EAPI=2
-inherit flag-o-matic
-
-DESCRIPTION="Multilingual Library for Unix/Linux"
-HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
-SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-#IUSE="anthy gd ispell"
-IUSE="gd"
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXrender
-	x11-libs/libXft
-	dev-libs/libxml2
-	dev-libs/fribidi
-	>=media-libs/freetype-2.1
-	media-libs/fontconfig
-	gd? ( media-libs/gd[png] )
-	>=dev-libs/libotf-0.9.4
-	>=dev-db/m17n-db-${PV}"
-# linguas_th? ( || ( app-i18n/libthai app-i18n/wordcut ) )
-# anthy? ( app-i18n/anthy )
-# ispell? ( app-text/ispell )
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	append-flags -fPIC
-	econf $(use_with gd) || die
-}
-
-src_compile() {
-	emake -j1 || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/dev-libs/m17n-lib/m17n-lib-1.5.4.ebuild b/dev-libs/m17n-lib/m17n-lib-1.5.4.ebuild
deleted file mode 100644
index 53ee3c21c1b3..000000000000
--- a/dev-libs/m17n-lib/m17n-lib-1.5.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/m17n-lib/m17n-lib-1.5.4.ebuild,v 1.3 2012/12/03 07:13:23 naota Exp $
-
-EAPI=2
-inherit flag-o-matic
-
-DESCRIPTION="Multilingual Library for Unix/Linux"
-HOMEPAGE="https://savannah.nongnu.org/projects/m17n"
-SRC_URI="http://www.m17n.org/m17n-lib-download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-#IUSE="anthy gd ispell"
-IUSE="gd"
-
-RDEPEND="x11-libs/libXaw
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libXrender
-	x11-libs/libXft
-	dev-libs/libxml2
-	dev-libs/fribidi
-	>=media-libs/freetype-2.1
-	media-libs/fontconfig
-	gd? ( media-libs/gd[png] )
-	>=dev-libs/libotf-0.9.4
-	>=dev-db/m17n-db-${PV}"
-# linguas_th? ( || ( app-i18n/libthai app-i18n/wordcut ) )
-# anthy? ( app-i18n/anthy )
-# ispell? ( app-text/ispell )
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	append-flags -fPIC
-	econf $(use_with gd) || die
-}
-
-src_compile() {
-	emake -j1 || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/dev-libs/protobuf-c/protobuf-c-1.0.2-r1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.0.2-r1.ebuild
index efc925e43a25..b27d0901b966 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.0.2-r1.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.0.2-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/protobuf-c/protobuf-c-1.0.2-r1.ebuild,v 1.6 2015/05/17 20:18:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf-c/protobuf-c-1.0.2-r1.ebuild,v 1.7 2015/06/27 12:31:38 maekke Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/protobuf-2.5.0-r2[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild b/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild
index 830de14f2462..0a1138d55b77 100644
--- a/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild
+++ b/dev-libs/protobuf/protobuf-2.6.1-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/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild,v 1.5 2015/05/17 20:18:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/protobuf/protobuf-2.6.1-r3.ebuild,v 1.6 2015/06/27 12:30:59 maekke Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=1
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/google/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="Apache-2.0"
 SLOT="0/9" # subslot = soname major version
-KEYWORDS="~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ppc ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 arm ~arm64 -hppa ~ia64 ~mips ppc ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="emacs examples java python static-libs vim-syntax zlib"
 
 CDEPEND="emacs? ( virtual/emacs )
diff --git a/dev-libs/serd/serd-0.20.0.ebuild b/dev-libs/serd/serd-0.20.0.ebuild
index 2dd9b1cbe33e..b2016bd05443 100644
--- a/dev-libs/serd/serd-0.20.0.ebuild
+++ b/dev-libs/serd/serd-0.20.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-libs/serd/serd-0.20.0.ebuild,v 1.2 2015/01/03 00:11:15 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/serd/serd-0.20.0.ebuild,v 1.3 2015/06/27 09:49:21 ago Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc static-libs test"
 
 RDEPEND=""
diff --git a/dev-lua/lgi/lgi-0.9.0.ebuild b/dev-lua/lgi/lgi-0.9.0.ebuild
index 0b1ca89ba5de..6033666d59a4 100644
--- a/dev-lua/lgi/lgi-0.9.0.ebuild
+++ b/dev-lua/lgi/lgi-0.9.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-lua/lgi/lgi-0.9.0.ebuild,v 1.1 2015/06/11 01:10:11 robbat2 Exp ${PV}.ebuild,v 1.7 2015/04/02 18:22:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/lgi/lgi-0.9.0.ebuild,v 1.3 2015/06/27 12:40:36 maekke Exp ${PV}.ebuild,v 1.7 2015/04/02 18:22:41 mr_bones_ Exp $
 
 EAPI=4
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pavouk/lgi/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="examples test"
 
 RDEPEND=">=dev-lang/lua-5.1
diff --git a/dev-perl/Acme-Damn/Acme-Damn-0.60.0.ebuild b/dev-perl/Acme-Damn/Acme-Damn-0.60.0.ebuild
new file mode 100644
index 000000000000..32c3f9dd1720
--- /dev/null
+++ b/dev-perl/Acme-Damn/Acme-Damn-0.60.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Acme-Damn/Acme-Damn-0.60.0.ebuild,v 1.1 2015/06/26 21:48:30 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=IBB
+MODULE_VERSION=0.06
+inherit perl-module
+
+DESCRIPTION="Module, that 'unblesses' Perl objects"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Test-Exception
+		virtual/perl-Test-Simple
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-respect-cflags.patch" )
+
+SRC_TEST="do"
diff --git a/dev-perl/Acme-Damn/Manifest b/dev-perl/Acme-Damn/Manifest
index 36c5b502f940..f159f6de7d28 100644
--- a/dev-perl/Acme-Damn/Manifest
+++ b/dev-perl/Acme-Damn/Manifest
@@ -1 +1,2 @@
 DIST Acme-Damn-0.05.tar.gz 8363 SHA256 a8e8c122ffdf7f34a0a20472efd59514944766e4d9bbb58d1440bc44b6d2bfd8 SHA512 19b46816adbd7087cbffb6bca8437051a888f9e81fca8b033eac4c906a67e4695690adf7cf8333c066cbb3d7045b6ae086daf0e64f0dcd06c5b0226fe02b4409 WHIRLPOOL a10480e963163884f258a42500f42e53cd013b31f5061559f014059e5abb8cf106dec0f3c2b6bac75e6130b811e9636758660ad3de5e74ce9dcd06773be97be7
+DIST Acme-Damn-0.06.tar.gz 8635 SHA256 7925c932b9f89d2ca413680af68ed9809e7093e4ecd5bc2bd4147bdaee39ee6f SHA512 f225e5f835ce9b054087008d354278356704694147cf8e1027c0bd2c4a8c118ebbdeac2c97634e4c85cf45d29bf38a92861770c35b8423b6f12a1bc6319ff52d WHIRLPOOL 50b288b6a313505238935b0f58d4885407ad6f0c349696c229ad874e6b67f92f7d00eb3a8ace474e47d1f66c321c881d50009b07478d9994e5ba8795d2a02470
diff --git a/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.7.0.ebuild b/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.7.0.ebuild
index fe1c660585c2..938589021221 100644
--- a/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.7.0.ebuild
+++ b/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.7.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/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.7.0.ebuild,v 1.1 2015/06/21 19:14:57 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.7.0.ebuild,v 1.2 2015/06/27 13:39:59 zlogene Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Convert arbitrary Perl Modules' versions into normalised Gentoo versions"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Guard/Guard-1.23.0.ebuild b/dev-perl/Guard/Guard-1.23.0.ebuild
new file mode 100644
index 000000000000..24244fc557a8
--- /dev/null
+++ b/dev-perl/Guard/Guard-1.23.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-perl/Guard/Guard-1.23.0.ebuild,v 1.1 2015/06/26 21:44:11 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=MLEHMANN
+MODULE_VERSION=1.023
+inherit perl-module
+
+DESCRIPTION="Safe cleanup blocks"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
+
+SRC_TEST="do"
diff --git a/dev-perl/Guard/Manifest b/dev-perl/Guard/Manifest
index deef44f360ee..4cfc6d00ced3 100644
--- a/dev-perl/Guard/Manifest
+++ b/dev-perl/Guard/Manifest
@@ -1 +1,2 @@
 DIST Guard-1.022.tar.gz 6793 SHA256 35f1ba97f19a5029ecd1eba94399259592e359e0f5686aef6e758496484a5869 SHA512 9eb1c4fa29f6190115fe11215ff5d27bb3e7f5ab60c7f40c4142ad9ff8aad91b0b169204e4d0f1b1638381c0c99e6a0b5627b8b6d60fad62f1392a9d1e49751e WHIRLPOOL 463c8231bb56114d2c75fedd3efc96c00b4401e5f15ad767a2520804fe0f5d37f2906538eddfe7b831fd1aeba32c7e5dcd1a57be1ff0aa3375452d91d40d1575
+DIST Guard-1.023.tar.gz 7065 SHA256 34c4ddf91fc93d1090d86da14df706d175b1610c67372c01e12ce9555d4dd1dc SHA512 a991d6f9ebfadffbcabaccc45d964c40c46c7212c6de089f0c496040e151236c59cc7dd7076464f0ef96936f2c4cd462fbedf8e729d522f1090682eda976676f WHIRLPOOL 63eb6e3167adf35fa3bb428b28e768f0922fa7e7df36243631ded455eefa3259af241ed8d857bd048856465ba42fabc81e0794e12ed71c19878f6968b06bd9d9
diff --git a/dev-perl/HTML-Format/HTML-Format-2.110.0.ebuild b/dev-perl/HTML-Format/HTML-Format-2.110.0.ebuild
new file mode 100644
index 000000000000..517171b4d462
--- /dev/null
+++ b/dev-perl/HTML-Format/HTML-Format-2.110.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Format/HTML-Format-2.110.0.ebuild,v 1.1 2015/06/26 21:25:01 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=NIGELM
+MODULE_VERSION=2.11
+inherit perl-module
+
+DESCRIPTION="HTML Formatter"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	virtual/perl-Encode
+	dev-perl/Font-AFM
+	dev-perl/HTML-Tree
+	virtual/perl-IO
+	virtual/perl-parent
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.360.100
+	test? (
+		dev-perl/File-Slurp
+		virtual/perl-File-Spec
+		virtual/perl-Scalar-List-Utils
+		>=virtual/perl-Test-Simple-0.960.0
+	)
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/HTML-Format/Manifest b/dev-perl/HTML-Format/Manifest
index 907fb44d8b17..4d7246b435e0 100644
--- a/dev-perl/HTML-Format/Manifest
+++ b/dev-perl/HTML-Format/Manifest
@@ -1 +1,2 @@
 DIST HTML-Format-2.10.tar.gz 45383 SHA256 149f4ac19733042e3f81b965047e9a053d8e5eb0832437625f4b9de860d5819a SHA512 a15a471fab17285704dbfb91b226d75d2bda0fbacbb5ce9259bc72fd4e7d5ba2129b5b4f133d68ebe3f03ddad0620e2e757f29bf4c7af819bf00333c2fad200c WHIRLPOOL 75bea74964f996e1b73cf665f4705f9157922c1d5ec50700857672c84087577a2836e97f2e4098fedf4fe0d22be8b92caf9cf9a0bae02098e2b3955e9a40bbcf
+DIST HTML-Format-2.11.tar.gz 48697 SHA256 44a3af6b9d0184bb4cc300624352760e4435c3d802521742f42dd228e44d4a95 SHA512 e664b442fdde64009c48998c1168558a8256f81d4a9d2f3b610ad89ddfcfa846dfaaef837becda4a0ee4df1b36c05ca066d45ac374a23159ffdaba82730089fe WHIRLPOOL b832f691beead56e26ed78055293f344000c9a243886e6131b959cfc91729e4bcb4ef907481804afde3fe2253c893d28156443996eada2de0d3bac6a4427780e
diff --git a/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.60.0.ebuild b/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.60.0.ebuild
new file mode 100644
index 000000000000..b18aadadd52e
--- /dev/null
+++ b/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.60.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-FormatText-WithLinks-AndTables/HTML-FormatText-WithLinks-AndTables-0.60.0.ebuild,v 1.2 2015/06/27 14:40:31 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=DALEEVANS
+MODULE_VERSION=0.06
+inherit perl-module
+
+DESCRIPTION="Converts HTML to text with tables intact"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/HTML-Format
+	dev-perl/HTML-FormatText-WithLinks
+	dev-perl/HTML-Tree
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/HTML-FormatText-WithLinks-AndTables/Manifest b/dev-perl/HTML-FormatText-WithLinks-AndTables/Manifest
index 51363497b599..8d5428b80eb1 100644
--- a/dev-perl/HTML-FormatText-WithLinks-AndTables/Manifest
+++ b/dev-perl/HTML-FormatText-WithLinks-AndTables/Manifest
@@ -1 +1,2 @@
 DIST HTML-FormatText-WithLinks-AndTables-0.02.tar.gz 6937 SHA256 4e97159a8b8ab5ea0c417da2931221124dc0e1221a3307b270891d6f21852224 SHA512 905bb42cbdf9591418dcf738ee1aaa6b6e1d56c47aaf8c4194bb17b43745cc6d82a4eb65d74ad8c95531940ad67c539329b327d5385f88e80f0a879a6e10bba2 WHIRLPOOL 59c4022248c126a81ae6e43fbb5c22ed0ceeac67610bdadac4e2c60396b3b418d71b533193a3dcf1306cf871a3b5d5c453649b3ea5c66895d9dc51fbbebf56c7
+DIST HTML-FormatText-WithLinks-AndTables-0.06.tar.gz 299894 SHA256 e5b23f0475fb81fd6fed688bb914295a39542b3e5b43c8517494226a52d868fa SHA512 c930fcc5919d20a67a00826aec11d1d2416a3ae145cf30acee98aa45bc64523858ba49907957c5772b4bedaa1e79ed7a0afef3101c29f913fcf983ce1dddd4c2 WHIRLPOOL 6cf0c0053bc020448d73334ef7d5f2a8ef1ac99dee5eea15bfb75517d37e535863bb0f9f341fab65b09762592d6cb37ca14fc833a9fcc6e55faa96979baedc8f
diff --git a/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.14.ebuild b/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.140.0.ebuild
similarity index 78%
rename from dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.14.ebuild
rename to dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.140.0.ebuild
index 7a0775962489..02553e6aee72 100644
--- a/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.14.ebuild
+++ b/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.140.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-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.14.ebuild,v 1.1 2014/05/28 10:18:02 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.140.0.ebuild,v 1.1 2015/06/26 21:29:35 dilfridge Exp $
 
 EAPI=5
 
diff --git a/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.150.0.ebuild b/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.150.0.ebuild
new file mode 100644
index 000000000000..a99d0b9fbc52
--- /dev/null
+++ b/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.150.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-FormatText-WithLinks/HTML-FormatText-WithLinks-0.150.0.ebuild,v 1.1 2015/06/26 21:29:35 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=STRUAN
+MODULE_VERSION=0.15
+inherit perl-module
+
+DESCRIPTION="HTML to text conversion with links as footnotes"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/HTML-Format-2
+	dev-perl/HTML-Tree
+	dev-perl/URI
+"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.380.0
+	test? ( virtual/perl-Test-Simple )
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/HTML-FormatText-WithLinks/Manifest b/dev-perl/HTML-FormatText-WithLinks/Manifest
index cda5c912b8e9..d995af1e39de 100644
--- a/dev-perl/HTML-FormatText-WithLinks/Manifest
+++ b/dev-perl/HTML-FormatText-WithLinks/Manifest
@@ -1 +1,2 @@
 DIST HTML-FormatText-WithLinks-0.14.tar.gz 11339 SHA256 35ececbc8a3ceda23e03c1e88b1e1ba02193deb455630d093ed30365e845e8ff SHA512 ec2cf859401985aaac45ba5ae1da18b3a142d51d821154ad40497a1ec468d86a6a6b85d7a1a66ec2d06bac49fe699def702c4cad86f1fa52da364cb29b6994b7 WHIRLPOOL 53515b3a6ae2ef21ba5bd2f39ace2e76560eef0a673242c17a9ac49f15ca85e18ddc38371f97be84bc3d72dcac7dfd6c11c31ca6c4d3ba76f521a542341da6f3
+DIST HTML-FormatText-WithLinks-0.15.tar.gz 11915 SHA256 7fcc1ab79eb58fb97d43e5bdd14e21791a250a204998918c62d6a171131833b1 SHA512 cdec4ba94c3f9dfd4e9c8b03be0e24068b23b634499bce062e0b281b26ad3a0288c0d4cc35b4db62fd81ad5f0a0f9ce42a59478af10a81ca2f5901ab79cdf550 WHIRLPOOL 85a90fb039273c390e8f395f48404313891f305588d2cec87d6f5552326caa18ecdc7e201e78243147ab80359d3bf081b082abef55eb160d536bb07982317cec
diff --git a/dev-perl/HTML-Mason-PSGIHandler/HTML-Mason-PSGIHandler-0.530.0.ebuild b/dev-perl/HTML-Mason-PSGIHandler/HTML-Mason-PSGIHandler-0.530.0.ebuild
new file mode 100644
index 000000000000..12cf60369262
--- /dev/null
+++ b/dev-perl/HTML-Mason-PSGIHandler/HTML-Mason-PSGIHandler-0.530.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason-PSGIHandler/HTML-Mason-PSGIHandler-0.530.0.ebuild,v 1.1 2015/06/27 14:44:55 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=RUZ
+MODULE_VERSION=0.53
+inherit perl-module
+
+DESCRIPTION="PSGI handler for HTML::Mason"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-perl/CGI-PSGI
+	dev-perl/HTML-Mason
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.300.0
+	test? (
+		dev-perl/Plack
+		virtual/perl-Test-Simple
+	)
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/HTML-Mason-PSGIHandler/Manifest b/dev-perl/HTML-Mason-PSGIHandler/Manifest
index dafadb3c7a14..72284dc2b9b9 100644
--- a/dev-perl/HTML-Mason-PSGIHandler/Manifest
+++ b/dev-perl/HTML-Mason-PSGIHandler/Manifest
@@ -1 +1,2 @@
 DIST HTML-Mason-PSGIHandler-0.52.tar.gz 13167 SHA256 e48e4362f983871da804b497a7ac176d6bffb503ea958ae92c8fb768af967157 SHA512 92e24c9f7e66f995c76ab8fdc1e494006eb9c3680f9cd86012e96500e16f02c40c885d175ab1bc19d9f22f62cfa064c81ce5d075de3c6278c2a485b320c6db62 WHIRLPOOL 61b201ea5298aed063f41abd7abb002437cea5b70b7dd07839e0fe4dfef71189474b01ec46f0434c3f46c4f61f90af14495fee859aab6e3e6b977d8191b1cffe
+DIST HTML-Mason-PSGIHandler-0.53.tar.gz 14157 SHA256 eafd7c7655dfa8261df3446b931a283d30306877b83ac4671c49cff74ea7f00b SHA512 d8fe27ff0b25e41b7e64e83c277d323f5207b66e7630e3f688d586c375c63b1837935934a67e630c54fe8219e7b44fe084875e1530d36044fac85884ea62da40 WHIRLPOOL a3ee8c29eaec8aa8775a894542f645c7f037d5032111f65980f8bfc001d1152fd51be9505aab63ff86d2b75c8502d6e55d0a0054af0ec5dd074df9623892c4b5
diff --git a/dev-perl/HTML-Mason/HTML-Mason-1.510.0.ebuild b/dev-perl/HTML-Mason/HTML-Mason-1.560.0.ebuild
similarity index 71%
rename from dev-perl/HTML-Mason/HTML-Mason-1.510.0.ebuild
rename to dev-perl/HTML-Mason/HTML-Mason-1.560.0.ebuild
index 810cfaa5caec..a46f8b535d42 100644
--- a/dev-perl/HTML-Mason/HTML-Mason-1.510.0.ebuild
+++ b/dev-perl/HTML-Mason/HTML-Mason-1.560.0.ebuild
@@ -1,37 +1,42 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.510.0.ebuild,v 1.6 2015/06/13 22:50:35 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Mason/HTML-Mason-1.560.0.ebuild,v 1.1 2015/06/26 21:40:57 dilfridge Exp $
 
 EAPI=5
 
-MODULE_AUTHOR=JSWARTZ
-MODULE_VERSION=1.51
+MODULE_AUTHOR=DROLSKY
+MODULE_VERSION=1.56
 inherit depend.apache perl-module
 
 DESCRIPTION="A HTML development and delivery Perl Module"
 HOMEPAGE="http://www.masonhq.com/ ${HOMEPAGE}"
 
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="modperl test"
 
-RDEPEND="!modperl? ( dev-perl/CGI )
+RDEPEND="
+	!modperl? ( >=dev-perl/CGI-2.460.0 )
 	modperl? (
 		www-apache/libapreq2
 		>=www-apache/mod_perl-2
 	)
-	>=dev-perl/Params-Validate-0.7
-	>=dev-perl/Class-Container-0.08
-	>=dev-perl/Exception-Class-1.15
+	>=dev-perl/Cache-Cache-1
+	>=dev-perl/Class-Container-0.70.0
+	>=dev-perl/Exception-Class-1.150.0
+	virtual/perl-File-Spec
 	dev-perl/HTML-Parser
+	>=dev-perl/Log-Any-0.80.0
+	>=dev-perl/Params-Validate-0.70.0
 	virtual/perl-Scalar-List-Utils
-	virtual/perl-File-Spec
-	>=dev-perl/Cache-Cache-1.01
-	dev-perl/Log-Any"
-
+"
 DEPEND="${RDEPEND}
-	dev-perl/Module-Build
-	test? ( dev-perl/Test-Deep )"
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.880.0
+		dev-perl/Test-Deep
+	)
+"
 
 want_apache2 modperl
 
diff --git a/dev-perl/HTML-Mason/Manifest b/dev-perl/HTML-Mason/Manifest
index 88f510457340..1dbb9faaaac4 100644
--- a/dev-perl/HTML-Mason/Manifest
+++ b/dev-perl/HTML-Mason/Manifest
@@ -1,2 +1,2 @@
-DIST HTML-Mason-1.51.tar.gz 302267 SHA256 44769105f49b939f9dd2d83c2c1969ce52a149b741340f0154c7b860ae8575c7 SHA512 c585f1fedfef4ecdd5a366f79687fe61f1942374a6acc2ca7f8238819b0e43617524b273f173ac52d7037d6459ce11c2bca5f36015c0f245a063653446b614c2 WHIRLPOOL f8ad9a10273712f2f709c71e9a73b6db2637eb763eab9fc0b610cf779ee779a85513e3b9759431a4a6f6156487cb6207e7a4494dfa6c793fbf6fb3f98f3479c0
 DIST HTML-Mason-1.54.tar.gz 302498 SHA256 a7657205a16e17049da9c9e0f8fac4a3c5fef23965e635372cbff6f2b8452219 SHA512 341548326391331b22d4adb60363b63149d13406bfe79683f5f69965811e9b6e43e36336b3503eca42792e70db589b264c093074635ea01860598cd90c6e1dc6 WHIRLPOOL c00d01bcbb48e55fd02b11235e6acba06389f5a11f5e6213b741c054e93663ff77dfa4a78481e7dce931ab41a5cb93323f8b4f2fcc8113813df81a2bc3a1648f
+DIST HTML-Mason-1.56.tar.gz 314167 SHA256 84ac24fb1d551f998145435265e5b6fd4a52ec61e4fadd3d7755eb648be2c4b2 SHA512 3492a37b8289209a2215b42be71db242ca150f4364d8422e46ca4762f2cdbddf96a56f44a3462d1f1eb23ef3bbe1cb36b8322106f4050404b988c6d90a05911c WHIRLPOOL bccf39f71a76fd54bf57a12f2da676611657fff7f28db73d5e7192f920ac5b3a124e0720ef094b697043e602ebf7320774cc0599944e2d00015a956e50b5f315
diff --git a/dev-perl/HTML-Packer/HTML-Packer-2.0.0.ebuild b/dev-perl/HTML-Packer/HTML-Packer-2.0.0.ebuild
new file mode 100644
index 000000000000..d4ff5625c9fc
--- /dev/null
+++ b/dev-perl/HTML-Packer/HTML-Packer-2.0.0.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-perl/HTML-Packer/HTML-Packer-2.0.0.ebuild,v 1.1 2015/06/27 14:47:54 dilfridge Exp $
+
+EAPI=5
+MODULE_AUTHOR=LEEJO
+MODULE_VERSION=2.00
+inherit perl-module
+
+DESCRIPTION='Another HTML code cleaner'
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/Regexp-RegGrp-1.1.1_rc
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
+	test? ( virtual/perl-Test-Simple )
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/HTML-Packer/Manifest b/dev-perl/HTML-Packer/Manifest
index be101c26c70e..dfee251ac076 100644
--- a/dev-perl/HTML-Packer/Manifest
+++ b/dev-perl/HTML-Packer/Manifest
@@ -1 +1,2 @@
 DIST HTML-Packer-1.004001.tar.gz 32201 SHA256 52a13886576bd27c9ef7a98cdef95c5f043c6eb3e49bb3a28bbac1e911353445 SHA512 ca6fdc6746cd7aa28b1f17ea50b8f360841dda4f3754d21859d65f508f501a5eb51a02f4205c76d801b567d4d1f6f8e7709f82dc6b95d23be36b7839abb37a10 WHIRLPOOL e6625467ee2e094f4aa1b0c04b435effdcdd2437c967f013dc24dc7c3c5ea95fbf7a851b046555def9b9bea00b161bd5d5ab226690fe0353682c0ab06142326c
+DIST HTML-Packer-2.00.tar.gz 33994 SHA256 1dd3262be3ef04f40a124ad7e7d34ed44c2ea71c1a80c81b825cb7efdd2577f1 SHA512 7779363839bd8ae6c477afbe4e8dafd807a8e5f8eb274153d42cb8dc698d5109e48233f31e7952b963cdfd72d3209ca448e0200c100054185b0d84baa44c5bd6 WHIRLPOOL 819595720e7ae783ddefa3dbc857b44d214a554ec591ecf32fbf86f148075fc9ffeca7cf32c5b370bcf78126bda4590b3b7ec58b1790eb74965f51105373b33f
diff --git a/dev-perl/HTML-Strip/HTML-Strip-2.90.0.ebuild b/dev-perl/HTML-Strip/HTML-Strip-2.90.0.ebuild
new file mode 100644
index 000000000000..e24e220b1764
--- /dev/null
+++ b/dev-perl/HTML-Strip/HTML-Strip-2.90.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Strip/HTML-Strip-2.90.0.ebuild,v 1.1 2015/06/27 14:51:37 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=KILINRAX
+MODULE_VERSION=2.09
+inherit perl-module
+
+DESCRIPTION="Extension for stripping HTML markup from text"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Test-Exception
+		virtual/perl-Test-Simple
+	)
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/HTML-Strip/Manifest b/dev-perl/HTML-Strip/Manifest
index 85ac6da11444..39a3946a2336 100644
--- a/dev-perl/HTML-Strip/Manifest
+++ b/dev-perl/HTML-Strip/Manifest
@@ -1 +1,2 @@
 DIST HTML-Strip-1.06.tar.gz 7764 SHA256 51d14e786066804764d6e12d262447b4472a2c36c663ea2c89a3c4ec1435c1ab SHA512 5be8afcae09e427af04b99d9f3fb5a664ea2c84a7cb5fb672d164fe5e991aaeaf7f811b8fd195c404da67a996dd6fdb51ab1e37745a6f7f548e05222ffb73747 WHIRLPOOL 801ac579715ff653cfb4b7a415bca82d684fd285f29464898b6a3eab847f8d26e7a1e7c4773f98db3a63243d51ea0d6329e2203e0aae7d3097cdb07f7e9d4d09
+DIST HTML-Strip-2.09.tar.gz 15040 SHA256 3f310370d0a677d17ca539508afb054be869b68acaec9aea239a057aa04d81d7 SHA512 8dc1935b401a60b4ae510cfd492b103471d197f0820fb17bd37f5e5f30b0f110f99bc196c53bdfed65ebc3ba5068d4c8e4871020e6e97015a60b64ea38aecd5d WHIRLPOOL 3610570ba02744b0edc2107bda680f498b3d3af7a21eb0215e798d032a59f54793c09d9cc7d01f0c5ed22378601a6940e791723a6db4358f7531c957fb979b73
diff --git a/dev-perl/HTML-TableExtract/HTML-TableExtract-2.130.0.ebuild b/dev-perl/HTML-TableExtract/HTML-TableExtract-2.130.0.ebuild
new file mode 100644
index 000000000000..91b802b63187
--- /dev/null
+++ b/dev-perl/HTML-TableExtract/HTML-TableExtract-2.130.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-TableExtract/HTML-TableExtract-2.130.0.ebuild,v 1.1 2015/06/27 14:56:03 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=MSISK
+MODULE_VERSION=2.13
+inherit perl-module
+
+DESCRIPTION="The Perl Table-Extract Module"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-perl/HTML-Element-Extended-1.160.0
+	dev-perl/HTML-Parser
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+mydoc="TODO"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/HTML-TableExtract/Manifest b/dev-perl/HTML-TableExtract/Manifest
index c9fd264c287f..030e0e23a62e 100644
--- a/dev-perl/HTML-TableExtract/Manifest
+++ b/dev-perl/HTML-TableExtract/Manifest
@@ -1 +1,2 @@
 DIST HTML-TableExtract-2.11.tar.gz 27123 SHA256 1861d55a2aa1728ef56ea2d08d630b9a008456f1106994e4e49e76f56e4955ee SHA512 ffe77574ac213d9e210e48e221ef7a77922409285005b3a3a27cea82efd8e48756ed2398e3ac645b591395be4f28e868ed1c2d236d128f5159f733d78785e853 WHIRLPOOL 8d333603a4f3157660a3c1e0453a3db5233b6761abdbf1c3a9e5ae4342bfce61a18d7f3c2b8b9b3b4f1b6931c41c278fea63b5c3030d04568ef579b6709c038f
+DIST HTML-TableExtract-2.13.tar.gz 36417 SHA256 0a7d81a265d2d46aeeb277a9d7cd5f5e2c8e3765959b641252c8e0a175ad5106 SHA512 7a35952c37d6c2997e50901208cce06af97b597574f91a14d3e7700bef42df398721a6b42fe14bd3ed3733d248e80c2c8f0029c6e2caab4bc66a84474bdddf7c WHIRLPOOL e36d84401024643977d3fe05f2f0ae69e8b10ca2d1e539fbb4508ace3d0f47dea90675e3fc6939f2c99e3d49ffbe8ff665db682828ccdc71af58d2e2ccd13c45
diff --git a/dev-perl/HTML-TableParser/HTML-TableParser-0.400.0.ebuild b/dev-perl/HTML-TableParser/HTML-TableParser-0.400.0.ebuild
new file mode 100644
index 000000000000..6571de45022f
--- /dev/null
+++ b/dev-perl/HTML-TableParser/HTML-TableParser-0.400.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-perl/HTML-TableParser/HTML-TableParser-0.400.0.ebuild,v 1.1 2015/06/27 14:59:54 dilfridge Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=DJERIUS
+MODULE_VERSION=0.40
+inherit perl-module
+
+DESCRIPTION="Extract data from an HTML table"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-perl/HTML-Parser-3.260.0
+"
+DEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
+	virtual/perl-CPAN-Meta
+	test? (
+		>=virtual/perl-Test-Simple-0.320.0
+		dev-perl/Test-Pod
+		dev-perl/Test-Pod-Coverage
+	)
+"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/HTML-TableParser/Manifest b/dev-perl/HTML-TableParser/Manifest
index b75b8b835b83..6068638c25ee 100644
--- a/dev-perl/HTML-TableParser/Manifest
+++ b/dev-perl/HTML-TableParser/Manifest
@@ -1 +1,2 @@
 DIST HTML-TableParser-0.38.tar.gz 73084 SHA256 8b18054261228e7c88ad0213e649cf95cdf493795f7e86d03c81264d50aa7bec SHA512 44c026acf52ab731fc6cdec24d073ac6375443d9c46a70599614de1cf017cb355e7a206cd7f9017a68ba7dbd79d87d7f41e49a9233c9bbf14002e4bc890ca99f WHIRLPOOL c2f5ae0a2ed69ac44a72b14e6d900acd4d5af71d987291634ccc410e5702191cc228ca40d3cbc657f87304bb82691367c52620c2e1c669a7dbf5a5fc5f29d68e
+DIST HTML-TableParser-0.40.tar.gz 77006 SHA256 34e5782ef23c0d9c10c63ad3cc79f5e2769f6e169caf38792a0ed5457437ebbb SHA512 c394734acbec92cf3ab6886302d316879c69170a3382520a60739e71517b05abe0cce88306d8ae1f1702b60f73fa39bca89a56ad0dc55adb2b0804dfb8aaf015 WHIRLPOOL c9cbd9df0e19172e87f67a011828e63fe0ff036aa6e8dbee6673874c16f77aa8f31e86065dbd61b25acae123ad56eca41561d175759ae4dcd719d696acc11980
diff --git a/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.11.ebuild b/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.11.ebuild
index ab63ea504d14..29c7f247e086 100644
--- a/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.11.ebuild
+++ b/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.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/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.11.ebuild,v 1.6 2015/05/20 04:51:00 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.11.ebuild,v 1.7 2015/06/27 13:39:04 zlogene Exp $
 
 EAPI=5
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Only use Sub::Exporter if you need it"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ~ppc64 x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-php/pecl-mongo/pecl-mongo-1.6.3.ebuild b/dev-php/pecl-mongo/pecl-mongo-1.6.3.ebuild
index 098f218e5f54..5d8a09b41226 100644
--- a/dev-php/pecl-mongo/pecl-mongo-1.6.3.ebuild
+++ b/dev-php/pecl-mongo/pecl-mongo-1.6.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-php/pecl-mongo/pecl-mongo-1.6.3.ebuild,v 1.1 2015/02/27 03:15:24 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-mongo/pecl-mongo-1.6.3.ebuild,v 1.2 2015/06/27 09:48:25 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ DESCRIPTION="MongoDB database driver"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest
index 038bd296c74f..f0df1af0adf9 100644
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@@ -3,3 +3,4 @@ DIST alabaster-0.6.3.tar.gz 11749 SHA256 30d72e732d61f3ac74bb8bd6a2b063ec7b0522b
 DIST alabaster-0.7.2.tar.gz 15024 SHA256 f8f436a350e37607a3a3d333b6c2d9baf3320cd661e72e95ee0e3037ac7a3157 SHA512 1a1b2c7f76b2c93042044c869e376512bda975765497186908520cba314129bb3ad34d39ab365105331d696b54eeae3094e320c2cb6429ebbd30a2019157b5e3 WHIRLPOOL 532da1cee88e9eedbb53acc263031ecbc796d90ea11075fc02108329b416c6a516ae7681b5ce7970d6e094dc836ed40f050bc75c8966b4e611b50f9af015d1b1
 DIST alabaster-0.7.4.tar.gz 15183 SHA256 ce77e2fdbaabaae393ffce2a6252a0a666e3977c6c2fa1c48c4ded0569785951 SHA512 42d7939b49b843611f6fe8be8b8c5f02cda9a3bb81b27a60c7764ff894d40a4a74deeadf183b3a23631100e925c76ce2cb3f8b479ce9c17ae279d5f720cf26af WHIRLPOOL e07b8cb114421463c105f9ec8eb4a6ffe6cdd1bd27eccdb36348e22f61fafb18d9b00eb5db1e4238897e8aec328840ec8a4ca259dce9f3fe2a1bb5ea2a9fb4fd
 DIST alabaster-0.7.5.tar.gz 16204 SHA256 8022f269eba3aefd390b927ac740ab1da7af15838e1c90caed0e66370eef8fd3 SHA512 abe51a04224163cd834609dd3a07710f12ec7c52e0859f25327e8067db27a460d723d340c25f8f2440f92c9ba2a968e021993a07bb8faef093d6af0a6209a4c8 WHIRLPOOL 1838aa91704b5c533847127052170731c2aad786c791c31a53d675fe95bc80fa764c595b272d9e4a3a01e646f533752320d2029057f794b3368ac1242e9aac89
+DIST alabaster-0.7.6.tar.gz 16598 SHA256 309d33e0282c8209f792f3527f41ec04e508ff837c61fc1906dde988a256deeb SHA512 90058e56365c59a4eed6034273ea83132fcf77ee26e3dfd2d9aa0233657192e1f32d8f40cd6477e307d063d0136ea5e18b94c6c0874a378d6386874dceccfdc8 WHIRLPOOL 2249f055772ce7a389df88a4a659a9a2b0b7c45992d9e225f93ecc79c9038c89474554fdf3557c78ff645242cffa0f1c4822f1b08831f1943140244931b7c812
diff --git a/dev-python/alabaster/alabaster-0.7.6.ebuild b/dev-python/alabaster/alabaster-0.7.6.ebuild
new file mode 100644
index 000000000000..8ef4cd05bc26
--- /dev/null
+++ b/dev-python/alabaster/alabaster-0.7.6.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/alabaster/alabaster-0.7.6.ebuild,v 1.1 2015/06/26 12:33:59 jlec Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="A configurable sidebar-enabled Sphinx theme"
+HOMEPAGE="https://github.com/bitprophet/alabaster"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
+SLOT="0"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/algopy/Manifest b/dev-python/algopy/Manifest
index ce469e0234f3..fbb8a6163888 100644
--- a/dev-python/algopy/Manifest
+++ b/dev-python/algopy/Manifest
@@ -1,2 +1,3 @@
 DIST algopy-0.5.1.tar.gz 135183 SHA256 509e3ec6068bd6ed4c336546f8a8d84aa1083c2fd50a1a4f4d26df606bd0e901 SHA512 384e22e89db7bc999aad29269d0f9669d4b72f3cd08860a4346801470b5b912d63cea8493c902639f35526e53979771dea8c8b3caf2d431ca45bb47892cd1308 WHIRLPOOL b8121f3106d5b05e60ce81517531d4d0de6756dc7fa2af11eea0c2fce55cfc9a306dfd928fc778886f4742308e7bea12ea49eed87d11438fc1e6efd274d0d282
 DIST algopy-0.5.2.tar.gz 148172 SHA256 a87aeb8a406fd26a3aecd6f2d7634135411ce77b9623665c51cb8a194fb76234 SHA512 9c8cd6947050d39d312836c14b790acab4ccdc9e8fcb060916f777a330da35ea8c7f987c26e3116da8a7a3bd004860d5aef789e74768c21c687febcfffdf6444 WHIRLPOOL 966d21c2d71eddba0d277706c3a88d14d76024bba60433ab8dd4e45459cbef1f08efd141debd05b039c9180618f13c23f92cb68bad6fd648109f1a3b3b69d5fc
+DIST algopy-0.5.3.tar.gz 149560 SHA256 2380bafeeeca4e07012d4b0017e163fce260dc50f2d8593ca883b2d761338aed SHA512 43b3cd4f17fa821fc61898534f595202097cd56d57133a1d13e23743c794166a0f8877947cc6eae6d2ac2fd7400e2a6527ee8229ec1b26ea660ac9c01cd22912 WHIRLPOOL d81ae613354879d99bdfc60b962ee5be7b6a2eeef1f7da7c76a2e90cd0ae187abd860f658c379e945b10fbf82b3972eae9ef2036ccd8f251c618a58f0cf09969
diff --git a/dev-python/algopy/algopy-0.5.3.ebuild b/dev-python/algopy/algopy-0.5.3.ebuild
new file mode 100644
index 000000000000..df02441a18b3
--- /dev/null
+++ b/dev-python/algopy/algopy-0.5.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/algopy/algopy-0.5.3.ebuild,v 1.1 2015/06/26 12:35:19 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Taylor Arithmetic Computation and Algorithmic Differentiation"
+HOMEPAGE="https://pypi.python.org/pypi/algopy http://packages.python.org/algopy"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	${EPYTHON} run_tests.py || die
+}
diff --git a/dev-python/foolscap/foolscap-0.7.0.ebuild b/dev-python/foolscap/foolscap-0.7.0.ebuild
index 96e0ff0aafc4..9dfb9d13ff64 100644
--- a/dev-python/foolscap/foolscap-0.7.0.ebuild
+++ b/dev-python/foolscap/foolscap-0.7.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-python/foolscap/foolscap-0.7.0.ebuild,v 1.1 2014/10/02 00:47:37 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/foolscap/foolscap-0.7.0.ebuild,v 1.3 2015/06/28 11:40:55 zlogene Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://${PN}.lothar.com/releases/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc +ssl test"
 
 RDEPEND=">=dev-python/twisted-core-2.5.0[${PYTHON_USEDEP}]
diff --git a/dev-python/gmpy/gmpy-2.0.4.ebuild b/dev-python/gmpy/gmpy-2.0.4.ebuild
index 3afe65576544..d4bbb64d76ce 100644
--- a/dev-python/gmpy/gmpy-2.0.4.ebuild
+++ b/dev-python/gmpy/gmpy-2.0.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/dev-python/gmpy/gmpy-2.0.4.ebuild,v 1.4 2015/05/17 07:44:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gmpy/gmpy-2.0.4.ebuild,v 1.5 2015/06/28 10:11:52 zlogene Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc mpir"
 
 RDEPEND="
diff --git a/dev-python/hacking/hacking-0.10.2.ebuild b/dev-python/hacking/hacking-0.10.2.ebuild
index 592f8ef483de..fc84de73630d 100644
--- a/dev-python/hacking/hacking-0.10.2.ebuild
+++ b/dev-python/hacking/hacking-0.10.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/hacking/hacking-0.10.2.ebuild,v 1.1 2015/05/20 06:48:54 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/hacking/hacking-0.10.2.ebuild,v 1.2 2015/06/27 12:34:59 maekke Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
index 7f0d077bbe4a..d540ff9f2483 100644
--- a/dev-python/humanfriendly/Manifest
+++ b/dev-python/humanfriendly/Manifest
@@ -1,3 +1,4 @@
 DIST humanfriendly-1.25.tar.gz 23072 SHA256 a6811938ff17c3df24c5b91569f44bff17f1ccbb60e0d756a5bfd13b554d479c SHA512 e62cfcd4f0119830cb21b10eb7514aebe1283fc4dc9cbc22cfad1cb3c73fcad46ac5e4e3a2aa7ccffc5f5b8389d616e1dcaa622fee420c5fcd7138948c69cd54 WHIRLPOOL ef7161c9893b5b59b5b89fce7aabbd4fd8954d316874e53a2352258cdccfe4dbcacb2fc46711490f90fa0f56f19734b6617e5e844c8f004142faac38a890b8c4
 DIST humanfriendly-1.26.tar.gz 25228 SHA256 0908b90298364e3335a03abcbb88ec571f95c7e4bc6728de0551806f636ef219 SHA512 d4cf81d6c9e39c2d5fb4886dc84c6037c6b189a5e54360b1fcaab5728c74b5ab4fe95c574d4b211888a8cbe6f1bce563106adb65b6a0d9533aa40e6ce434cf7c WHIRLPOOL f8d6a080bcfc8ac9dfacdc2387c4050ea81dd294eb703d4198ac82678e3ef71f4ecce0a2af4dfd85c068548c96a42c904ff2efc8bf4c429137e60aef684ec614
 DIST humanfriendly-1.27.tar.gz 26128 SHA256 b80c391baf5c7d5f634391d62c9869c4d20dd6167c53ba2e3765f9ad2bc54638 SHA512 b2fcf239958e9889c22a99396e78d157adf390e2b5dbcbc3f89eb42ca7a87ec278e2969d05fc3388c07af929b1046cd4a14d3347c7c9287e6a7f4cbbb7322688 WHIRLPOOL a0d277784dd906891bf1217653141379770bbf703645af34fe220b253f9939fdb0ebea90e35a9cb2c17f5e5f6099805c05dbb888fe23af581ac7fab43459ef07
+DIST humanfriendly-1.29.tar.gz 27120 SHA256 9c1983d79a61f77ab6c42973baf2ebb156dbb608516415f3c4066cbe3400e8d7 SHA512 b42e1e7e66c1326cef1134b662f7026c9b3883f0871752cbb6d334de68fc6f6e92ae6524bb9c64b7185bc28f612c6daf0650bd8c9a9121d5fea704b51bd7843f WHIRLPOOL a068a0cbdd7ec3d41ea54d5cf9cc80b8c88bc6089d48f546638c5128cf918720549667464a32bca0b2f6f266f3ff8194ab352b159db3de7a554d2eb2a449854e
diff --git a/dev-python/humanfriendly/humanfriendly-1.29.ebuild b/dev-python/humanfriendly/humanfriendly-1.29.ebuild
new file mode 100644
index 000000000000..61a4d5fac512
--- /dev/null
+++ b/dev-python/humanfriendly/humanfriendly-1.29.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/dev-python/humanfriendly/humanfriendly-1.29.ebuild,v 1.1 2015/06/26 12:37:46 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Human friendly output for text interfaces using Python"
+HOMEPAGE="https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	esetup.py test || die
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
new file mode 100644
index 000000000000..2c529900bb43
--- /dev/null
+++ b/dev-python/hypothesis/Manifest
@@ -0,0 +1 @@
+DIST hypothesis-1.6.2.tar.gz 57047 SHA256 92cd990b4b4f78af338b8f7485a922616c39ddc12090a016a8a8e7faede56b4e SHA512 d4964f5f4e303c0b914435c0f5d3149be8570240bb132b7da1749c567c2a93493d619b8d59086b2b689e01d8a7ceb939c9eeccbd8de742630a4508374f1d37f5 WHIRLPOOL 83960e73d6bb5c1984b8de3157a2b8c475422c3453a2546ec8ea82fdf71e659a98079c6cdd318be600861c6fcc491b49268805ed490d6517e4b4621bda37b5db
diff --git a/dev-python/hypothesis/hypothesis-1.6.2.ebuild b/dev-python/hypothesis/hypothesis-1.6.2.ebuild
new file mode 100644
index 000000000000..dfc68b519fd1
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-1.6.2.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/hypothesis/hypothesis-1.6.2.ebuild,v 1.1 2015/06/27 09:18:20 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/DRMacIver/hypothesis"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/hypothesis/metadata.xml b/dev-python/hypothesis/metadata.xml
new file mode 100644
index 000000000000..301d2207cc29
--- /dev/null
+++ b/dev-python/hypothesis/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>python</herd>
+</pkgmetadata>
diff --git a/dev-python/ipython/ipython-2.2.0-r1.ebuild b/dev-python/ipython/ipython-2.2.0-r1.ebuild
index 59feba675f46..980d9e4bef68 100644
--- a/dev-python/ipython/ipython-2.2.0-r1.ebuild
+++ b/dev-python/ipython/ipython-2.2.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-python/ipython/ipython-2.2.0-r1.ebuild,v 1.4 2015/06/26 08:04:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ipython/ipython-2.2.0-r1.ebuild,v 1.6 2015/06/27 12:46:21 zlogene Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 IUSE="doc examples matplotlib mongodb notebook nbconvert octave qt4 +smp test wxwidgets"
 
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 577f4f9eac25..04a48fae7cda 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -1 +1,2 @@
 DIST moto-0.3.8.tar.gz 101161 SHA256 0215034a2834d86ff622c11bcba2570240a54635cda5ec83d48c1e663179b047 SHA512 f414499b6c475b3a5e69570997b0f96fc9d998f622209d48b686c1f77a33e984e95028806ae1ba1ec1d41d75e59b83f96bd66b566c8a7b664dacc910c0035edd WHIRLPOOL 13e5edd809a772c9ce955196ca268db4663c8d68959a4fa7fcaaa44ebf0f6d147d471bf00d27a6ec2d0a4e4a1a037fb09756ad92d0733601f852f522f2ce265e
+DIST moto-0.4.3.tar.gz 147498 SHA256 955b0a19d466c917b5c9e97a03df6f10d184dea263efdd7796b1725b4a90a48c SHA512 3c8a2b5cf2b404f531d187adb96f03d38ec89ce147066922f8da7e71e33b2cbe01b5264d1dd7f7abddc9a94759e4ee6b3111da3838796acbd1a83ad6fbfd4a21 WHIRLPOOL 8cf88239a4c1acbfce293133e68baa05783800754a1f07c33a3643f071bcb0a0e68f7215b8696a378de71369edfead00a1708ba0b276108e0bb446f981343943
diff --git a/dev-python/moto/moto-0.4.3.ebuild b/dev-python/moto/moto-0.4.3.ebuild
new file mode 100644
index 000000000000..b40ef3bb0c3f
--- /dev/null
+++ b/dev-python/moto/moto-0.4.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/moto/moto-0.4.3.ebuild,v 1.1 2015/06/27 05:37:27 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/boto-2.20.0[${PYTHON_USEDEP}]
+	dev-python/dicttoxml[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	>=dev-python/httpretty-0.6.1[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]"
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index 643f7732ac4b..98527a38af2d 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,3 +1,3 @@
-DIST natsort-3.2.0.tar.gz 14223 SHA256 283d488e4d3bb5f1a2bd7ed5d28c9d467e56fe9636f1d373f42357eb60a355f8 SHA512 bd6022d8d488a2391820ce8f06391b3c52c77a3ecd74d58bd18bf6af3a2648f6f8b502c4fb68899176eb83015d23d91dc8a8d1918fba0db63bc85d7902bc4205 WHIRLPOOL 398cac91e22054e1cab3d4c9017a4eaf4917afb66c3a4cc528968b5def40f207616cbe7e32fee15469dd39dc4cc288d964900d1d93a7430bee33165ee91c458a
 DIST natsort-3.4.0.tar.gz 16113 SHA256 a58ea2410eedf587adda3f2a4ef93a820a99028b253b510c79ef5b4a11cd1dbb SHA512 5aa91f2cbdec3e97081cc7248e7d596437f5c0b53151eb59a95c161b35d331c80737f5ffe39c74a0233a0c20ffec7d244d9e70d6fb7263880270c8379c81bc44 WHIRLPOOL 792034fe0e266db6a508ddb9faf7a557a0e38aa8c3f10dec3c3debda917fe1f5c86f097199f42f83fe422fbbc6770c4d39adb1cff9a811fdd5dcad4dcec07002
 DIST natsort-3.5.2.tar.gz 42534 SHA256 f8129379aeb5a99ec6fbbb57acbcabeb0b0996db6a8bea3f9feb6766650ce642 SHA512 cc9004f12e3097812045da5cf7bd7ea146875044e43bea21f0ca5afe8487d7a7c399d46c14e89366fa126b9b517e43561d08bd12cdd2a58de7a6b261b71d1eaf WHIRLPOOL 3ce656c514e62dc83c10d282eb9adfc660108d12cb656d09bb8f118ebecf653eca3a5d719f1824e76f396f09cd52f3187d08f21850b5609560be0397b451942e
+DIST natsort-4.0.1.tar.gz 58968 SHA256 48fde822e66a7f08de8ecf29367f4007c625f6d6260c9ce17f41d0f0c6aac687 SHA512 4b3cd0a6756cf1b55f5a23d6e461e7a4e998870f6eb9039260977b5aa2a7ec6827276d8675da49f1eb71d33f6854e1be6abc347c638564a5e949a01446d28e3f WHIRLPOOL 63be3f76ee518b1bd1ed815b5828e42d8c7261cc75ea789e1238106ae9559df8c26d4e1d3a723490b642fcf53733a88d5efe439db1b746215fb5bb6a58190115
diff --git a/dev-python/natsort/natsort-3.2.0.ebuild b/dev-python/natsort/natsort-3.2.0.ebuild
deleted file mode 100644
index 26c6e72ad7d8..000000000000
--- a/dev-python/natsort/natsort-3.2.0.ebuild
+++ /dev/null
@@ -1,20 +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/natsort/natsort-3.2.0.ebuild,v 1.2 2014/06/06 03:13:53 idella4 Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Natural sorting for Python"
-HOMEPAGE="https://pypi.python.org/pypi/natsort"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/natsort/natsort-4.0.1.ebuild b/dev-python/natsort/natsort-4.0.1.ebuild
new file mode 100644
index 000000000000..650c611442ed
--- /dev/null
+++ b/dev-python/natsort/natsort-4.0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/natsort/natsort-4.0.1.ebuild,v 1.1 2015/06/27 09:57:16 idella4 Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Natural sorting for Python"
+HOMEPAGE="https://pypi.python.org/pypi/natsort"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)"
+
+python_prepare_all() {
+	# Skip troublesome test that require a setting of LC_ALL-C
+	sed -e 's:test_locale_convert_transforms_float_string_to_float_with_de_locale:_&:g' \
+		-i test_natsort/test_locale_help.py || die
+	sed -e 's:test_natsorted_with_LOCALE_and_de_setting_returns_results_sorted_by_de_language:_&:' \
+		-i test_natsort/test_natsort.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# https://github.com/SethMMorton/natsort/issues/31
+	# For now elect to run the testsuite with a msg reporting cause of breakage by upstream
+	einfo "Testsuite fails reporting no module slow_splitters"
+	einfo "The tarball form upstream is missing 1 folder and 4 files"
+	py.test || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/ndg-httpsclient/Manifest b/dev-python/ndg-httpsclient/Manifest
index 460ea75c2435..f40dd41bab3b 100644
--- a/dev-python/ndg-httpsclient/Manifest
+++ b/dev-python/ndg-httpsclient/Manifest
@@ -1 +1,2 @@
 DIST ndg_httpsclient-0.3.2.tar.gz 21514 SHA256 cc806d43f3e79be40f923d94f542f23a94c6ddbb9a63258b0bf875f325508973 SHA512 0060d1b0f749cc3017f4d5550bf0e7242e035f5f84a914a23219a85ba0dd9185e6edf88c38db16df8dfe05beb267262cc2fed00758c0b4d8b2ee222abe2d642e WHIRLPOOL a7d058939909b5b9ffc8c4f9432d97f4cbb76824b34cc5bf9fd0d32edcf2cee77daad34ad48ad8927c2a3c2a30c960cdc5568131706d15089749f3037b66607d
+DIST ndg_httpsclient-0.4.0.tar.gz 24038 SHA256 e8c155fdebd9c4bcb0810b4ed01ae1987554b1ee034dd7532d7b8fdae38a6274 SHA512 3c0225a20c25cf0f12f03005bb79e738527c0488bb660c1eb3b55c505a0ef503002d37fcffb3d013e5f91101bdd03080a68d5805d6d29b682cc01bdc9f0e4a19 WHIRLPOOL 0c9c0a2cd2e5a0d2b742910129442285e4bdf1278c2590443fa00107066f5561af4249d4f1504720e8a48342ba1d0110fe8480e0adcd41ca999384bf3dc06853
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
new file mode 100644
index 000000000000..487d364c6350
--- /dev/null
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.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/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild,v 1.1 2015/06/28 05:54:17 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
+HOMEPAGE="https://github.com/cedadev/ndg_httpsclient/
+	https://pypi.python.org/pypi/ndg-httpsclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="dev-python/pyopenssl[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${P/-/_}"
+
+# doc build by Makefile in folder documentation is broken
diff --git a/dev-python/neovim-python-client/Manifest b/dev-python/neovim-python-client/Manifest
index 0b3945db3a8b..e577ab3cfd5d 100644
--- a/dev-python/neovim-python-client/Manifest
+++ b/dev-python/neovim-python-client/Manifest
@@ -1,2 +1,3 @@
 DIST neovim-python-client-0.0.32.tar.xz 38188 SHA256 ee3eaf21eaa9ad5cf22d2f125ce294e9c7800763af02c4352e476b1b4a7f48be SHA512 cdf1b2889e57cd3bc63ba0aada085e839f122ea85baeecefd60591a9253b92a4fa89a8ca408745aa19f3178b19d7f5dbedbb72d90e19394b3330324bf0675d97 WHIRLPOOL 9912982f95cbed3556e85b05e0b393e51b1a313b93268d62db288a61b78c1034efea66d5723f5c541b9e871be499170523f881dedb81dee918629d587920c17f
 DIST neovim-python-client-0.0.34.tar.xz 37736 SHA256 20c8d67c94e6825e1063bc7d5213a7d867330b5cdf2e889f50d1014f161ba48a SHA512 74498e14415af8a033a130aca1ee00d5b7519fe19bc34c0fce605c6861b0d7220c3fd22a7de475cbdc5604b43a7a6d4444a62a1d0e44141e0efef8f06524c3e2 WHIRLPOOL 4c2eee61405486ea388a23bf4e26b1f26276aed1f6b5e519703980ee735eccd4c54e24a533e35112b9f8d56acea80feb71620fe5a6425fd80cfbfa65f591411f
+DIST neovim-python-client-0.0.36.tar.xz 37988 SHA256 ba0a200b345ea860c214d9928b1fb2970d4d9358f92357e1f096c976a14e02c4 SHA512 64483d3dbac43c6876a7ea29043f6a49fdb1a0b64ca042b3064767d52ff6613393b2752a40bd712c4d9223ed4003a91ca4289f64a142edd7d1de89d19ee50533 WHIRLPOOL d60617e9b07db9d27c4ed469a7c514f724102bf71a4b3c7bf1c26a672df60151583dd5c7912f3c82b02955f6db3e7a35eada16058cf8b26d38944d0dcdee6f8e
diff --git a/dev-python/neovim-python-client/neovim-python-client-0.0.36.ebuild b/dev-python/neovim-python-client/neovim-python-client-0.0.36.ebuild
new file mode 100644
index 000000000000..b8ff462b828e
--- /dev/null
+++ b/dev-python/neovim-python-client/neovim-python-client-0.0.36.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/neovim-python-client/neovim-python-client-0.0.36.ebuild,v 1.1 2015/06/27 03:48:21 yngwin Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+inherit distutils-r1
+
+DESCRIPTION="Python client to connect to Neovim thru its msgpack-rpc API"
+HOMEPAGE="https://github.com/neovim/python-client"
+SRC_URI="http://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-python/click-3.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/greenlet[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep 'dev-python/trollius[${PYTHON_USEDEP}]' python{2_7,3_3} 'pypy*')"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/nltk/nltk-2.0.4.ebuild b/dev-python/nltk/nltk-2.0.4.ebuild
index 58457ece0379..766693388658 100644
--- a/dev-python/nltk/nltk-2.0.4.ebuild
+++ b/dev-python/nltk/nltk-2.0.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/dev-python/nltk/nltk-2.0.4.ebuild,v 1.4 2015/04/08 08:05:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/nltk/nltk-2.0.4.ebuild,v 1.5 2015/06/27 09:48:35 ago Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://nltk.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="numpy tk"
 
 RDEPEND="${RDEPEND}
diff --git a/dev-python/numba/Manifest b/dev-python/numba/Manifest
index 62536e869f9b..f92b38c21d06 100644
--- a/dev-python/numba/Manifest
+++ b/dev-python/numba/Manifest
@@ -1,2 +1,2 @@
-DIST numba-0.17.0.tar.gz 682420 SHA256 1c33b3b9b6995f0ea25623824605d7ab15867d39e577e524bf052d13985ca1bc SHA512 bf5dc7dd0b580fe07a82452bc383d59725a9b1cb0fea6e617ed6ab6460c77b13565760d521d34a61c82d350c150834fe7b350fe25be5351b49bbc0d7187b2f16 WHIRLPOOL 7e7e3f386587fee975347ba545d582222efcc133da7a93791a2f2ec48f2e25044bbe1c6d336bc9f06f74539a3732413d1e03642df6ca00e3de94f4b83aa7af56
 DIST numba-0.18.2.tar.gz 786935 SHA256 5988621a8dd3609d252435c8e280bf01e2f25d9eb63bb8ae49487fe013235a7f SHA512 03d0511df1a5e98f4166a1febc51b6bc4dbf4ca8b432c315a93c8a5c762f6d0ac830fd264c4b42cdb52f262a24c6777885abcccc6e61e08605f30c4bb830850d WHIRLPOOL d62e5e14191146d301fd5475023d0e711e1a014f52c8d2d4661529adb6190006c37259e9a45a8336e5e4cbf8d60fa8a69babce6e0cf01a297ef43d1e7f563cf7
+DIST numba-0.19.2.tar.gz 871394 SHA256 10bdd84a3a8dfb9b195ad7d3b11c1f52693833820268c64837dc8510e66f1e2e SHA512 9eca230b5d69890680278248365e748b2e8a7e040703e80acaed2c0e1dc3576e102bde3809eceb6e600d90e02685e66419ca3423d332620c034fe9c07995aa67 WHIRLPOOL bfba05b56ff9fa9708b67dad1f514bc35c72ac3bf76e349f2ec20c63f7cb9c1664b106898559220e796ae9cafc7a48dbb5e6e537720d6cd4f6b5ccde4903dc67
diff --git a/dev-python/numba/files/numba-0.19.2-docbuild.patch b/dev-python/numba/files/numba-0.19.2-docbuild.patch
new file mode 100644
index 000000000000..1c8853c1b11c
--- /dev/null
+++ b/dev-python/numba/files/numba-0.19.2-docbuild.patch
@@ -0,0 +1,17 @@
+Delete intersphinx, delete entry to set sphinxjp.themecore which is absent from portage
+diff -ur numba-0.19.2.orig/docs/source/conf.py numba-0.19.2/docs/source/conf.py
+--- docs/source/conf.py	2015-06-28 15:19:14.573386743 +0800
++++ docs/source/conf.py	2015-06-28 15:20:16.808191183 +0800
+@@ -36,12 +36,9 @@
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+ # ones.
+ extensions = [
+-    'sphinx.ext.intersphinx',
+     'sphinx.ext.todo',
+     #'sphinx.ext.mathjax',
+     'sphinx.ext.autodoc',
+-    #'sphinx.ext.graphviz',
+-    'sphinxjp.themecore',
+ ]
+ 
+ todo_include_todos = True
diff --git a/dev-python/numba/numba-0.17.0.ebuild b/dev-python/numba/numba-0.17.0.ebuild
deleted file mode 100644
index 722bf7e2ef5c..000000000000
--- a/dev-python/numba/numba-0.17.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numba/numba-0.17.0.ebuild,v 1.1 2015/02/12 05:50:40 patrick Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-inherit distutils-r1
-
-DESCRIPTION="NumPy aware dynamic Python compiler using LLVM"
-HOMEPAGE="http://numba.pydata.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc examples test"
-
-RDEPEND="
-	dev-python/llvmlite[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
-"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep 'dev-python/funcsigs[${PYTHON_USEDEP}]' python2_7) )"
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		export CFLAGS
-	fi
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cd "${BUILD_DIR}"/lib* || die
-	${PYTHON} -c "import numba; numba.test()" || die
-}
-
-python_install_all() {
-	# doc needs obsolete sphnxjp package
-	use doc && dodoc docs/Numba.pdf
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numba/numba-0.19.2.ebuild b/dev-python/numba/numba-0.19.2.ebuild
new file mode 100644
index 000000000000..9d88ff4e1038
--- /dev/null
+++ b/dev-python/numba/numba-0.19.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numba/numba-0.19.2.ebuild,v 1.1 2015/06/28 10:06:51 idella4 Exp $
+
+EAPI=5
+
+# test phase is pointless since it errors in circa 60% of 1984 tests
+RESTRICT="test"
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="NumPy aware dynamic Python compiler using LLVM"
+HOMEPAGE="http://numba.pydata.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc examples test"
+
+RDEPEND="
+	dev-python/llvmlite[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python{2_7,3_3})
+	$(python_gen_cond_dep 'dev-python/funcsigs[${PYTHON_USEDEP}]' python2_7)"
+DEPEND="test? ( ${RDEPEND} )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+# Delete intersphinx & entry to set sphinxjp.themecore, which is absent from portage, from conf.py
+PATCHES=( "${FILESDIR}"/${P}-docbuild.patch )
+
+python_prepare_all() {
+	# Re-set them of doc build to one provided by sphinx
+	if has_version ">=dev-python/sphinx-1.3.1"; then
+		sed -e 's:basicstrap:classic:' -i docs/source/conf.py || die
+	else
+		sed -e 's:basicstrap:default:' -i docs/source/conf.py || die
+	fi
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	if ! python_is_python3; then
+		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
+		export CFLAGS
+	fi
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake -C docs/ html
+}
+
+python_test() {
+	cd "${BUILD_DIR}"/lib* || die
+	${PYTHON} -c "import numba; numba.test()" || die
+}
+
+python_install_all() {
+	# doc needs obsolete sphinxjp package
+#	use doc && dodoc docs/Numba.pdf
+	use examples && local EXAMPLES=( examples/. )
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/oauth2client/Manifest b/dev-python/oauth2client/Manifest
index d915f1a48a86..4b0332aa3a5e 100644
--- a/dev-python/oauth2client/Manifest
+++ b/dev-python/oauth2client/Manifest
@@ -1,3 +1,2 @@
 DIST oauth2client-1.4.11.tar.gz 107844 SHA256 c7f4af0ae4ef7717fc596709e5c5d6ee5775f1fa2b2d69ccfaf0c7c42f2e6756 SHA512 bf06e5a1bb903f940d1e384a9213e13e9e815460a5d79ad24942fbf619d70b39392bc764b0867faea4557bfe031e8a6734639401d6d4ac6297517d840b5191d3 WHIRLPOOL fad31559f000ce7a3154e9fa458bc9731c7e4ef7a392e74e6888e6ee5b649a31284adb1b487fa57406a8ff30b37c9a1a840f0b1fb66bc2a9573cabea2375f2bc
-DIST oauth2client-1.4.2.tar.gz 1028497 SHA256 8203da0b1cb1b03be296959c673c861b2465ec3c80d138af798605d0c562498b SHA512 91ae93d40184a752d44fa2e5bba6767373c3a143d58f833381070612248a8f74185c92e2718c688cbe5b7d27357ed1d0191977be1aa26844fe34466a210e9c51 WHIRLPOOL 1ef6cc703ff7c68c7fe3af979d602629c32d072a6c8266d7f77fd35c52d04696baa6e1c0f9b26b41a437f34e6495c99389bfee44b99e5c6824025eafd55ae1c4
 DIST oauth2client-1.4.6.tar.gz 95325 SHA256 d4376fc0f5543612c62cdee5ea68530bd9c8542891b3f4427d8bf9a1f5a134c8 SHA512 e75e6c535ca4e427f3a869fa7e600bf7544752a100f623cbbeb117d872a2361a60d1524fc2639521393a58dc6f684d9e1452980d6a5ffb6f4dbed516911cc4ca WHIRLPOOL acb26ef17115138a8932313cbbb8c9a802e2296d20343ab746123ad0ef8a38ea8587c10c45863b56b7b4d5b052675434236a050ae64c6c05546a42fd3cdc4f6b
diff --git a/dev-python/oauth2client/oauth2client-1.4.11.ebuild b/dev-python/oauth2client/oauth2client-1.4.11.ebuild
index ccec7faf313f..b96292e9ac5d 100644
--- a/dev-python/oauth2client/oauth2client-1.4.11.ebuild
+++ b/dev-python/oauth2client/oauth2client-1.4.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/dev-python/oauth2client/oauth2client-1.4.11.ebuild,v 1.2 2015/06/15 18:59:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauth2client/oauth2client-1.4.11.ebuild,v 1.3 2015/06/26 11:37:35 jlec Exp $
 
 EAPI=5
 
@@ -19,9 +19,9 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	~dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	~dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
+	~dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
 	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
 	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/oauth2client/oauth2client-1.4.2.ebuild b/dev-python/oauth2client/oauth2client-1.4.2.ebuild
deleted file mode 100644
index a870ee5836a2..000000000000
--- a/dev-python/oauth2client/oauth2client-1.4.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/oauth2client/oauth2client-1.4.2.ebuild,v 1.4 2015/06/15 18:59:01 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} pypy)
-
-inherit distutils-r1
-
-DESCRIPTION="Library for accessing resources protected by OAuth 2.0"
-HOMEPAGE="https://github.com/google/oauth2client"
-SRC_URI="https://github.com/google/oauth2client/archive/v1.4.2.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
-	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
-	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-# Needs network
-RESTRICT=test
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/oauth2client/oauth2client-1.4.6.ebuild b/dev-python/oauth2client/oauth2client-1.4.6.ebuild
index 1e7e3dfe8b7e..a2c5e5ba5663 100644
--- a/dev-python/oauth2client/oauth2client-1.4.6.ebuild
+++ b/dev-python/oauth2client/oauth2client-1.4.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-python/oauth2client/oauth2client-1.4.6.ebuild,v 1.5 2015/06/15 18:50:18 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oauth2client/oauth2client-1.4.6.ebuild,v 1.6 2015/06/26 11:37:35 jlec Exp $
 
 EAPI=5
 
@@ -19,9 +19,9 @@ IUSE="test"
 
 RDEPEND="
 	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
-	>=dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
-	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	~dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	~dev-python/pyasn1-modules-0.0.5[${PYTHON_USEDEP}]
+	~dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
 	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
 	!<=dev-python/google-api-python-client-1.1[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/oslo-sphinx/oslo-sphinx-2.5.0.ebuild b/dev-python/oslo-sphinx/oslo-sphinx-2.5.0.ebuild
index 0f3ed355b452..c46336836a6f 100644
--- a/dev-python/oslo-sphinx/oslo-sphinx-2.5.0.ebuild
+++ b/dev-python/oslo-sphinx/oslo-sphinx-2.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/dev-python/oslo-sphinx/oslo-sphinx-2.5.0.ebuild,v 1.3 2015/05/17 09:27:54 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/oslo-sphinx/oslo-sphinx-2.5.0.ebuild,v 1.4 2015/06/27 12:34:25 maekke Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86"
 IUSE=""
 
 # NOTE: dev-python/hacking is unecessary as there are no tests
diff --git a/dev-python/pandas/pandas-0.16.1-r1.ebuild b/dev-python/pandas/pandas-0.16.1-r1.ebuild
index 3f5f33ed0fd9..bb5bee6ea30c 100644
--- a/dev-python/pandas/pandas-0.16.1-r1.ebuild
+++ b/dev-python/pandas/pandas-0.16.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/dev-python/pandas/pandas-0.16.1-r1.ebuild,v 1.1 2015/05/15 11:30:51 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pandas/pandas-0.16.1-r1.ebuild,v 1.3 2015/06/28 10:29:59 zlogene Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc excel html test R"
 
 EXTRA_DEPEND="
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index 695b155da7cf..8d8e59c8aacf 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -3,3 +3,4 @@ DIST py-1.4.26.tar.gz 190617 SHA256 28dd0b90d29b386afb552efc4e355c889f4639ce9365
 DIST py-1.4.27.tar.gz 191447 SHA256 55c648870ba47375c52001d05a1adeedaa930937749ad66eb3327e8dea28ac79 SHA512 29d4c003f9382d5ae19ced0d1d759841b08ed8eb0e9d07e6105e974f4181c3cbb6b59908434eaf4f1164deac438258ccb25b89c0fec0f5a11e1d6487127af4a1 WHIRLPOOL bd3067bf8bbae2ab8ff51720132864701dbb347ecfca023c7dc0f85f6a94d73f77538e17bc8113cbf4946340be8e3f3faad04f92c2d8cee10a7ac3a497d48636
 DIST py-1.4.28.tar.gz 191592 SHA256 664dbb9fd86c26d26e90aa93d15b8a19c859128bb66b3905bef954eba737eeb5 SHA512 0f65ec7114d5d634cf8b0be0c91dee9c7ce7b4795143d1394f1e625586d852c3c0941b7e9490a1eb6a1d3ad5db7c64ab72b6532793f22fdda705a347d4945814 WHIRLPOOL 077f14d7e8a3e1ed1dbc3dd1a51ce55d0263f74b726ec66847c069ff91e81b9aab5581e031a5acbfdbbaaff22ced89efa7a362c2220db1964622342e6a02cd9f
 DIST py-1.4.29.tar.gz 192088 SHA256 279e117233f205de1e46ec36eb7ffa5999f1bc53ae6bcf06889477ff28e45d83 SHA512 c172b598c3b7c8d7e0cc9b3123e80443355a0422e5e19b052f02d4261610fd832431cb50df35a3ee4913a29f87e53da2b12c17234189a3faabfab0c9899c1469 WHIRLPOOL 5924f8d0a9ef6428edc5fecc7d59de277b3cf30f93ff437a9067b7d16150a9b5ac9b4389343ed53f4a504ab083a220d2c0eee0936ea3e5ae5909d4944c89e545
+DIST py-1.4.30.tar.gz 191796 SHA256 b703e57685ed7c280b1a51c496a4984d83d89def2a930b5e9e5da5a6ca151514 SHA512 dd9d92f8eaf8e5fc61bfb7feb4b07df5ae1745ebf88bcbe9d62589caa9e1f7d8beae5b2d20b407520919e47391cd50cf2d5323556fa5bd90a37e120b1d394d7a WHIRLPOOL 890cd2dbb957c291e80c73a69fad89846e761f745500ab2a99bfb4f725a7e567104fa4a2a957b8c674ebc9498fdbb25373ff0d15ab8da7f8c45138844235c79f
diff --git a/dev-python/py/py-1.4.30.ebuild b/dev-python/py/py-1.4.30.ebuild
new file mode 100644
index 000000000000..7437680b425e
--- /dev/null
+++ b/dev-python/py/py-1.4.30.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.30.ebuild,v 1.1 2015/06/26 12:42:33 jlec Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
+HOMEPAGE="http://pylib.readthedocs.org/ http://pypi.python.org/pypi/py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc test"
+
+RDEPEND=""
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2.4.2[${PYTHON_USEDEP}] )
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+	sed -e 's:intersphinx_mapping:#&:' -i doc/conf.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# 1 failure, test_comments, under both pypy only.
+	# Also appears the home repo has no issue tracker.
+	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/pycups/pycups-1.9.72.ebuild b/dev-python/pycups/pycups-1.9.72.ebuild
index 48419e23fd42..6dfa010018e6 100644
--- a/dev-python/pycups/pycups-1.9.72.ebuild
+++ b/dev-python/pycups/pycups-1.9.72.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/pycups/pycups-1.9.72.ebuild,v 1.1 2015/05/27 20:43:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycups/pycups-1.9.72.ebuild,v 1.2 2015/06/26 12:14:31 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 SLOT="0"
 IUSE="doc examples"
 
diff --git a/dev-python/pyfltk/files/pyfltk-1.3.0-format-security.patch b/dev-python/pyfltk/files/pyfltk-1.3.0-format-security.patch
new file mode 100644
index 000000000000..f29b7b3c9221
--- /dev/null
+++ b/dev-python/pyfltk/files/pyfltk-1.3.0-format-security.patch
@@ -0,0 +1,74 @@
+ python/fltk_wrap.cpp | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/python/fltk_wrap.cpp b/python/fltk_wrap.cpp
+index 9c16f59..ad42e89 100644
+--- a/python/fltk_wrap.cpp
++++ b/python/fltk_wrap.cpp
+@@ -5238,13 +5238,13 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject *args)
+ 
+   const char *fl_vararg_input(const char *label, const char *deflt = 0) {
+     const char* result = 0;
+-    result = fl_input(label, deflt);
++    result = fl_input("%s", deflt, label);
+     return result;
+   };
+ 
+   const char *fl_vararg_password(const char *label, const char *deflt = 0) {
+     const char* result = 0;
+-    result = fl_password(label, deflt);
++    result = fl_password("%s", deflt, label);
+     return result;
+   };
+ 
+@@ -5282,20 +5282,20 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject *args)
+ 
+   void fl_mt_message(const char* text) {
+     Py_BEGIN_ALLOW_THREADS;
+-    fl_message(text);
++    fl_message("%s", text);
+     Py_END_ALLOW_THREADS;
+   };
+ 
+   void fl_mt_alert(const char* text) {
+     Py_BEGIN_ALLOW_THREADS;
+-    fl_alert(text);
++    fl_alert("%s", text);
+     Py_END_ALLOW_THREADS;
+   };
+ 
+   int fl_mt_ask(const char* text) {
+     int status = 0;
+     Py_BEGIN_ALLOW_THREADS;
+-    status = fl_ask(text);
++    status = fl_ask("%s", text);
+     Py_END_ALLOW_THREADS;
+     return status;
+   };
+@@ -5303,7 +5303,7 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject *args)
+   int fl_mt_choice(const char *q,const char *b0,const char *b1,const char *b2) {
+     int status = 0;
+     Py_BEGIN_ALLOW_THREADS;
+-    status = fl_choice(q, b0, b1, b2);
++    status = fl_choice("%s", b0, b1, b2, q);
+     Py_END_ALLOW_THREADS;
+     return status;
+   };
+@@ -5311,7 +5311,7 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject *args)
+   const char *fl_mt_input(const char *label, const char *deflt = 0) {
+     const char* result = 0;
+     Py_BEGIN_ALLOW_THREADS;
+-    result = fl_input(label, deflt);
++    result = fl_input("%s", deflt, label);
+     Py_END_ALLOW_THREADS;
+     return result;
+   };
+@@ -5319,7 +5319,7 @@ PyObject *Fl_get_font_sizes_tmp(PyObject *self, PyObject *args)
+   const char *fl_mt_password(const char *label, const char *deflt = 0) {
+     const char* result = 0;
+     Py_BEGIN_ALLOW_THREADS;
+-    result = fl_password(label, deflt);
++    result = fl_password("%s", deflt, label);
+     Py_END_ALLOW_THREADS;
+     return result;
+   };
diff --git a/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild b/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild
index 3c6972caaa88..9b6b1a717892 100644
--- a/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild
@@ -1,10 +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/pyfltk/pyfltk-1.3.0-r2.ebuild,v 1.1 2015/06/23 15:59:54 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.3.0-r2.ebuild,v 1.3 2015/06/26 12:14:26 ago Exp $
 
 # FIXME: MakeSwig.py execution should be made work from pyfltk-1.1.5.ebuild
 
 EAPI=5
+
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 flag-o-matic
@@ -17,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="doc"
 
 DEPEND=">=x11-libs/fltk-1.3.0:1[opengl]"
@@ -25,9 +26,12 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-PATCHES=( "${FILESDIR}"/${P}-linux-3.x-detection.patch
-		"${FILESDIR}"/ignore-func.patch
-		"${FILESDIR}"/fltk_wrap.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-linux-3.x-detection.patch
+	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/ignore-func.patch
+	"${FILESDIR}"/fltk_wrap.patch
+	)
 
 python_prepare_all() {
 	# Disable installation of documentation and tests.
diff --git a/dev-python/pyfltk/pyfltk-1.3.3.ebuild b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
index 500d39368ce3..704380b02f7d 100644
--- a/dev-python/pyfltk/pyfltk-1.3.3.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.3.3.ebuild
@@ -1,10 +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/pyfltk/pyfltk-1.3.3.ebuild,v 1.1 2015/06/23 15:59:54 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.3.3.ebuild,v 1.2 2015/06/26 12:05:17 jlec Exp $
 
 # FIXME: MakeSwig.py execution should be made work from pyfltk-1.1.5.ebuild
 
 EAPI=5
+
 PYTHON_COMPAT=( python{3_3,3_4} )
 
 inherit distutils-r1 flag-o-matic
@@ -25,8 +26,11 @@ DEPEND=">=x11-libs/fltk-1.3.0:1[opengl]"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_PN}
-PATCHES=( "${FILESDIR}"/ignore-func.patch
-		"${FILESDIR}"/fltk_wrap.patch )
+
+PATCHES=(
+	"${FILESDIR}"/ignore-func.patch
+	"${FILESDIR}"/fltk_wrap.patch
+	)
 
 python_prepare_all() {
 	# Disable installation of documentation and tests.
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index e163682dbe90..53188a3257b7 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,2 +1,3 @@
 DIST pyglet-1.1.4.tar.gz 2946601 SHA256 1d9b2a5e3a37a9068aee70100d19bfa83a6bbf6d4a2af8adb4231a601a101611 SHA512 26e1b652bd0e2666014bd29c4456570eee5fdbcce694f49f424fdab3583d0fb67d835e9f0e09f0459dc65cf3c042fffbfbeb321b286890be03260c9ee30bf187 WHIRLPOOL 89424736a0da9abd62813159ff6367b2c536b9cbfe63aaaf1733c712161453a77b3086ca0f4a840a1f682f2bd5334e0decb28d71b7dc187135a799c711ce6afc
 DIST pyglet-1.2.2.tar.gz 2120758 SHA256 6b54c3881a5eb086f2733c24aada1b65625b45b36172cd7f63fbde2cf43138df SHA512 012dcf6f62a823a391f7ac81b4a6dc89cf2bfd1f3f895dfa115011efdcbd1327821a11c47d455ed4e2a3edbd041f8a5e5b3c5f27b336a6c4d17c028a8999dc69 WHIRLPOOL ab2f402076b2aed110cde901e49b003e336eb634ad8b3f084dd1a980a1079959639ec1773b3106185f443a50ed6db39c833133442b002a64d9254285372bcdb5
+DIST pyglet-1.2.3.tar.gz 2121343 SHA256 06c857039420bd21baad35fac99dca7f97951350c2df5a79bdcf89eb708907cb SHA512 dbc766b382b1fa79205d9777e8dcc0ecfa00d312671f10d4e9580ae648997d4a41db8bffc072893109df6772fa8d72c8fdf128e0421d992d14332fac11d4d4c4 WHIRLPOOL 38d23907825312d1140a294d6ec3152e373ae466a73766a067f8362937d48bc7be14b9f847cc3386a41adb927196fda4cdc62fb8d9f7d0c9ea9ec548f6213afc
diff --git a/dev-python/pyglet/pyglet-1.2.3.ebuild b/dev-python/pyglet/pyglet-1.2.3.ebuild
new file mode 100644
index 000000000000..fd8b2c57cdee
--- /dev/null
+++ b/dev-python/pyglet/pyglet-1.2.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyglet/pyglet-1.2.3.ebuild,v 1.1 2015/06/26 12:44:16 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="http://www.pyglet.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	http://pyglet.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="alsa examples gtk +openal"
+
+RDEPEND="
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib[alisp] )
+	gtk? ( x11-libs/gtk+:2 )
+	openal? ( media-libs/openal )"
+DEPEND="${RDEPEND}"
+#	ffmpeg? ( media-libs/avbin-bin )
+
+# pyglet.gl.glx_info.GLXInfoException: pyglet requires an X server with GLX
+RESTRICT=test
+
+python_test() {
+	python_is_python3 && return
+	VIRTUALX_COMMAND="${PYTHON}"
+	virtualmake tests/test.py
+}
+
+python_install_all() {
+	DOCS=( NOTICE )
+	use examples && EXAMPLES=( examples )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygobject/pygobject-3.16.2.ebuild b/dev-python/pygobject/pygobject-3.16.2.ebuild
index 7557b56147d6..4185445c0a65 100644
--- a/dev-python/pygobject/pygobject-3.16.2.ebuild
+++ b/dev-python/pygobject/pygobject-3.16.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/pygobject/pygobject-3.16.2.ebuild,v 1.1 2015/06/20 10:09:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-3.16.2.ebuild,v 1.2 2015/06/27 01:22:02 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -40,8 +40,12 @@ DEPEND="${COMMON_DEPEND}
 		x11-libs/cairo[glib]
 		x11-libs/gdk-pixbuf:2[introspection]
 		x11-libs/gtk+:3[introspection]
-		x11-libs/pango[introspection] )
+		x11-libs/pango[introspection]
+		!sparc? ( python_targets_python2_7? ( dev-python/pyflakes[$(python_gen_usedep python2_7)] ) ) )
 "
+# FIXME: remove "!sparc?" automagic nonsense above when pyflakes is
+# keyworded on sparc, bug #553380
+
 # gnome-base/gnome-common required by eautoreconf
 
 # We now disable introspection support in slot 2 per upstream recommendation
@@ -65,10 +69,19 @@ src_configure() {
 	# Hard-enable libffi support since both gobject-introspection and
 	# glib-2.29.x rdepend on it anyway
 	# docs disabled by upstream default since they are very out of date
-	python_foreach_impl run_in_build_dir \
+	configuring() {
 		gnome2_src_configure \
 			$(use_enable cairo) \
 			$(use_enable threads thread)
+
+		# Pyflakes tests work only in python2, bug #516744
+		if use test && [[ ${EPYTHON} != python2.7 ]]; then
+			sed -e 's/if type pyflakes/if false/' \
+				-i Makefile || die "sed failed"
+		fi
+	}
+
+	python_foreach_impl run_in_build_dir configuring
 }
 
 src_compile() {
diff --git a/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild b/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
index b180708094f3..59f20c6c403f 100644
--- a/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild
+++ b/dev-python/pylibacl/pylibacl-0.5.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-python/pylibacl/pylibacl-0.5.0-r1.ebuild,v 1.3 2015/06/21 10:42:18 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pylibacl/pylibacl-0.5.0-r1.ebuild,v 1.4 2015/06/26 10:08:11 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86"
 IUSE=""
 
 RDEPEND="sys-apps/acl"
diff --git a/dev-python/pyspf/Manifest b/dev-python/pyspf/Manifest
index 04546817cca0..cb15e9a9b28e 100644
--- a/dev-python/pyspf/Manifest
+++ b/dev-python/pyspf/Manifest
@@ -1,3 +1,2 @@
 DIST pyspf-2.0.10.tar.gz 62890 SHA256 0a3be1cc1915649ed8960a1b8add4110379c3c348e98e642a53f69d028709de8 SHA512 8a10a82fe5226ffee6376ea19f1fe075bb8676cd7eeadbfec1de95326fb8e6f08ad466e84129c016b62452f26f0552f1a463fc6a53d992c67ae1d8b1a18b3a46 WHIRLPOOL 5cceeda27c6a84f827c1505f7808e371f5eecc95737a98cd77d0b06dcccd58fe0d0971b9ecfadc7c23c69ee921eefe56cbb98974c47ea3b57d1b0bcfae5e050f
 DIST pyspf-2.0.11.tar.gz 63594 SHA256 693e80df3d61d69daaa2590e0f2bc8167d5fa36ce373d43987984cb00ae23928 SHA512 cababa82d1b6c206033a6583a67502d982a2c34baec0ccc08513a2bc9beb4cfc84dd5d615ac852fd25885c4abd43d9e8704f517c70fadb4a600d3b8a6254d755 WHIRLPOOL f1f97b8d0c6207a01d5d48aa3f63948749d3ceca590c146ec846638e263ba8155616e9d34af0bdfde3c1438869a3727a98154c054e0e33632c8cccd23d3f2e3d
-DIST pyspf-2.0.7.tar.gz 46283 SHA256 d26355f2576ed345971b88bec7a97795112476d022d10b943d8580c3f78b44db SHA512 879bff1904fe189ba1c01f10008f978413d5fcb52a564de6a028bb308985e099362a63c99a8a789b3406b925ab5aa1f911ea5a5bb23df593e0d891d8afda9877 WHIRLPOOL b958fd1318938364a8677948ab644d81dc36befd728496380bdbf49238d6fe53f551af633f2ab73ada829bbd6ccf804e175c513a374a53606669ca280b0ed1a7
diff --git a/dev-python/pyspf/files/pyspf-2.0.7-catch_unicode.patch b/dev-python/pyspf/files/pyspf-2.0.7-catch_unicode.patch
deleted file mode 100644
index eb56594260c2..000000000000
--- a/dev-python/pyspf/files/pyspf-2.0.7-catch_unicode.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-See https://bugs.launchpad.net/pypolicyd-spf/+bug/832480
-diff -ur pyspf-2.0.7.orig/spf.py pyspf-2.0.7/spf.py
---- spf.py	2012-02-03 10:26:20.000000000 +0800
-+++ spf.py	2013-04-05 15:56:53.370995142 +0800
-@@ -1129,7 +1129,7 @@
-             try:
-                 return [''.join(s.decode("ascii") for s in a)
-                     for a in self.dns(domainname, 'TXT')]
--            except UnicodeEncodeError:
-+            except UnicodeError:
-                 raise PermError('Non-ascii character in SPF TXT record.')
-         return []
-     def dns_99(self, domainname):
-@@ -1138,7 +1138,7 @@
-             try:
-                 return [''.join(s.decode("ascii") for s in a)
-                     for a in self.dns(domainname, 'SPF')]
--            except UnicodeEncodeError:
-+            except UnicodeError:
-                 raise PermError('Non-ascii character in SPF record.')
-         return []
- 
diff --git a/dev-python/pyspf/pyspf-2.0.10.ebuild b/dev-python/pyspf/pyspf-2.0.10.ebuild
index f01107dfb531..49065648b09a 100644
--- a/dev-python/pyspf/pyspf-2.0.10.ebuild
+++ b/dev-python/pyspf/pyspf-2.0.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-python/pyspf/pyspf-2.0.10.ebuild,v 1.2 2015/03/27 16:26:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyspf/pyspf-2.0.10.ebuild,v 1.3 2015/06/28 11:33:38 zlogene Exp $
 
 EAPI="5"
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="ipv6 test"
 
 # >=python-3.3 comes with the built-in ipaddress module
diff --git a/dev-python/pyspf/pyspf-2.0.7.ebuild b/dev-python/pyspf/pyspf-2.0.7.ebuild
deleted file mode 100644
index 0e86916f5fd7..000000000000
--- a/dev-python/pyspf/pyspf-2.0.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyspf/pyspf-2.0.7.ebuild,v 1.4 2013/03/23 11:25:15 ago Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.5 3.*"
-
-inherit distutils
-
-DESCRIPTION="Python implementation of the Sender Policy Framework (SPF) protocol"
-HOMEPAGE="http://pypi.python.org/pypi/pyspf"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-RDEPEND="dev-python/authres
-	|| ( dev-python/pydns:2 dev-python/pydns:0 )"
-DEPEND="${DEPEND}
-	test? ( dev-python/pyyaml )"
-
-PYTHON_MODNAME="spf.py"
-
-src_test() {
-	pushd test &> /dev/null
-	testing() {
-		PYTHONPATH="$(ls -d ../build-${PYTHON_ABI}/lib*)" "$(PYTHON)" testspf.py || die
-	}
-	python_execute_function testing
-	popd &> /dev/null
-}
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 0de6b80fb019..13dfde3ed7a8 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -6,6 +6,7 @@ DIST setuptools-15.2.tar.gz 628101 SHA256 381e78471fb0eff89c4b1a219e8739f48dd87c
 DIST setuptools-16.0.tar.gz 629567 SHA256 aa86255dee2c4a0056509750008007667c29306b7a6c13801468515b2c672845 SHA512 38a89aad89dc9aa682dbfbca623e2f69511f5e20d4a3526c01aabbc7e93ae78f20aac566676b431e111540b41540a1c4f644ce4174e7ecf052318612075e02dc WHIRLPOOL fc2f8c66fdb1329436d491cf62af3c989ec1885ce10ec02f9e1b5cfbab5a8ad6ea86b20c4790848d995b1c5b87838cc1acb24944df84392976eb03bc9eebf325
 DIST setuptools-17.0.tar.gz 629845 SHA256 561b33819ef3da2bff89cc8b05fd9b5ea3caeb31ad588b53fdf06f886ac3d200 SHA512 504ec0bd3ac0f9982da7cdcfb38bd8a54680aa52363b6654273c8ecb8046147b712025d2d3965475c8407b923b0a58e96dabf173a47cf36b1343a0d7a15eb991 WHIRLPOOL 0ddc8cdbb2151f71a9de8fbfe22aca30cd365a399881bff1568926ebe6c771b421a187ac007555447f18a2372195eba070ccf7a130a48f3672025c87553a9888
 DIST setuptools-17.1.1.tar.gz 630390 SHA256 5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431 SHA512 69b32baaac2954d7a9fb4df8738489c6abec090a69dc44781e60fae302443f28628730d0b72d9fa19a14045df0e512b6830be6bc603b97f73c16e7ba29b3b9c9 WHIRLPOOL 1a8b283a81ddb5cd5e393153db9b7f2a0ebb61c78c991558ae8c64706e17bb9db0597f34f577d1af9e9d4e2ec71eebba79553a3ee84ecada6f536b8d9657120e
+DIST setuptools-18.0.1.tar.gz 630585 SHA256 4d49c99fd51edf22baa997fb6105b07482feaebcb174b7d348a4307c29264b94 SHA512 9b318ce2ee2cf787929dcb886d76c492b433e71024fda9452d8b4927652a298d6bd1bdb7a4c73883a98e100024f89b46ea8aa14b250f896e549e6dd7e10a6b41 WHIRLPOOL 03a8aba7af5980d4e7680af1d7d2df2a16fb015e994e166f9f380119c4af136bad635a8ac90095a086c35dc90cf6872ea1aba190269425267bd844b37f8e50fe
 DIST setuptools-2.2.tar.gz 786831 SHA256 6fb1f21dea64e323e7ad2531a6795eeb6f5e17a85189dee61a86baca60b18984 SHA512 b5472e20f13c62ddc06513a964d8d85230a6cb8f4b0a6bc05c57d42aa3e682a850418246b5c1d769dba0cea18d7b262817f743b49a73383157a6b76d5637c296 WHIRLPOOL 6377efcf56082fdbea79cba7ae7c7d125d2368ea2309c9d655e4a568d40c8a6c9673dc1db63a2cb1f143436da411e664281ba239a058b5dff91b99cd2b5b332d
 DIST setuptools-7.0.tar.gz 793737 SHA256 dd9c1a2a0fdf37a7b142626700e0a0b7a3a0657b735c50d367fca932803be061 SHA512 0c52bf2d22f7bbd7560e8bb3184406426cf759980add0e60a864f15d9bcf10f01a2bfe0eb598c8c965b2e89df8c4159c2b43028b560f04192bba47e67d9cda18 WHIRLPOOL 70c0076960af3c00d49f79d5a0c3e3ec47a0b5009a20377cb7eca1e0747d6249d433ae14a0b86e5ac1f3bcc1efd99b68e48bd741458389c27ea05406af64e55f
 DIST setuptools-8.0.1.tar.gz 801353 SHA256 ab8eb279ca9062efc7e70f74a35f3dd9315835139ecaf3ae5bfdf4a7dc768e30 SHA512 c86a2c6ae5ed8205b9b37911002a8f551f2607ecab8b74b9eae6a7b92713c0d0a3d6aa54c4428df48765c1a2c9e21f53128bb1f138f7753e1f45188b0e357ff2 WHIRLPOOL 0ee70ee0a00118cb41005f77614bade6d5198a9164718bd7bb595b5cea0456ff829ac48cc8113c91d2f7830c4b4e9f4bd73245393621ae87e581b1e9b497f95d
diff --git a/dev-python/setuptools/setuptools-18.0.1.ebuild b/dev-python/setuptools/setuptools-18.0.1.ebuild
new file mode 100644
index 000000000000..8249a07db970
--- /dev/null
+++ b/dev-python/setuptools/setuptools-18.0.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/setuptools/setuptools-18.0.1.ebuild,v 1.1 2015/06/26 12:46:51 jlec Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="http://pypi.python.org/pypi/setuptools"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+DEPEND="
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)
+"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" py.test ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/simplejson/simplejson-3.7.2.ebuild b/dev-python/simplejson/simplejson-3.7.2.ebuild
index 5cd5518acb0d..00038f0123e8 100644
--- a/dev-python/simplejson/simplejson-3.7.2.ebuild
+++ b/dev-python/simplejson/simplejson-3.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-python/simplejson/simplejson-3.7.2.ebuild,v 1.1 2015/05/23 08:17:43 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-3.7.2.ebuild,v 1.2 2015/06/26 14:29:55 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/subunit/Manifest b/dev-python/subunit/Manifest
index 7bbafd2beaf3..bf25c7731d8f 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -5,3 +5,4 @@ DIST subunit-0.0.19.tar.gz 441610 SHA256 cd2921c49b07e1f524582d57f2d3b496ae4557f
 DIST subunit-0.0.21.tar.gz 441691 SHA256 f12565cb0c6efdee4d96e9e640db4bcbfbede734223de940f9f3969c4a8e2f4c SHA512 2bbf312c7d80c3bea02163924a205df5553be3eceab5b2951512f9d71110608f1243440491a22c878d0691b9197dfe19c5c49fbb608883a038fa86626144ab12 WHIRLPOOL 749b0763d568f6a9803de11a59b92b357b41b8ae64e531e6cdefcc6114d6c4f2799c6c36e8372b92f1d173123d7a5847782d1f3ff193c83a7755a95a773204e3
 DIST subunit-0.0.6.tar.gz 388872 SHA256 98f5e72107322dc1c502543384e1ed790671d319a5096eab4f4d20641555de77 SHA512 79aa46a2cbdbe27bb1fcfa02a65bd10ba9ccf5013f9cbd8549d5aad304b8d451ed6a854b1b77415601aab8f6966b7004337634ea5e7bd8387dda8209781b118f WHIRLPOOL fd05cfed6e7cd50df57dfc3dd0c45bf955a033abf7c43849193a9f7515847eb7d2df5819e964407dac253c46ba5073f2bb1499a92a94a072591a4db4d5128c2b
 DIST subunit-1.0.0.tar.gz 441964 SHA256 55dc2c1c22c650ad9f109516a72a9d37b986939de25b6195210724ce79ced0ba SHA512 082990e777667edb7d3666b554a1818a976369742a1ed9bbc47a9c59f97937c0619a315893f532e49c2cd798537b320ca2aa9df916906b85a75db8a7d4f8bc84 WHIRLPOOL e6650f991ecb0c7d0fc6001947cc5f11740c34783e62485bf5e8acebc9369665a8658789c7b7df5608efe8c5931b263952383231e8989f3be98cca2a807ba471
+DIST subunit-1.1.0.tar.gz 441946 SHA256 4869a5bec96b7b4e760d053f842d80548008740cda1a7efbb9053063ee818a51 SHA512 11aaa8f2ae04232623fbfb7b9561aa15bddbc55201a3a16eea1319a076de3417977590c57bb7ab0bbd86b321b203241ba5ea8050932759aeb3f3ed71b723a98b WHIRLPOOL 2705fcb98d0b67b5d2cddff87095a9b65782467f3e9b84f956ac29c85c2995881dcd63468a144277fb76b7adfdbbb2ecdc36eae8413886a72028e3565edbdf47
diff --git a/dev-python/subunit/subunit-1.1.0.ebuild b/dev-python/subunit/subunit-1.1.0.ebuild
new file mode 100644
index 000000000000..da64a94e7b90
--- /dev/null
+++ b/dev-python/subunit/subunit-1.1.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/subunit/subunit-1.1.0.ebuild,v 1.1 2015/06/26 12:45:31 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1 eutils multilib-minimal
+
+DESCRIPTION="A streaming protocol for test results"
+HOMEPAGE="https://launchpad.net/subunit http://pypi.python.org/pypi/python-subunit"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="static-libs test"
+
+RDEPEND=">=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+	dev-python/extras[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-lang/perl:=
+	>=dev-libs/check-0.9.11[${MULTILIB_USEDEP}]
+	>=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}]
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	test? ( dev-python/testscenarios[${PYTHON_USEDEP}] )"
+
+# Take out rogue & trivial failing tests that exit the suite before it even gets started
+# The removed class in fact works fine in py3 and fails with py2.7 & pupu
+# The setu to restrict this patch is just those 2 is not worth it.
+PATCHES=( "${FILESDIR}"/1.0.0-tests.patch )
+
+src_prepare() {
+	sed -i -e 's/os.chdir(os.path.dirname(__file__))//' setup.py || die
+
+	# Install perl modules in vendor_perl, bug 534654.
+	export INSTALLDIRS=vendor
+
+	# needed for perl modules
+	distutils-r1_src_prepare
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} \
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && distutils-r1_src_compile
+}
+
+python_test() {
+	local -x PATH="${PWD}/shell/share:${PATH}"
+	local -x PYTHONPATH=python
+	# Following tests are known to fail in py2.7 & pypy. They pass under py3.
+	# DO NOT re-file
+	# test_add_error test_add_error_details test_add_expected_failure
+	# test_add_expected_failure_details test_add_failure test_add_failure
+	# https://bugs.launchpad.net/subunit/+bug/1436686
+
+	"${PYTHON}" -m testtools.run all_tests.test_suite || die "Testing failed with ${EPYTHON}"
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && distutils-r1_src_test
+}
+
+multilib_src_install() {
+	local targets=(
+		install-include_subunitHEADERS
+		install-pcdataDATA
+		install-exec-local
+		install-libLTLIBRARIES
+	)
+	emake DESTDIR="${D}" "${targets[@]}"
+
+	multilib_is_native_abi && distutils-r1_src_install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-ruby/bundler-audit/Manifest b/dev-ruby/bundler-audit/Manifest
new file mode 100644
index 000000000000..5ea4e1ed7c3f
--- /dev/null
+++ b/dev-ruby/bundler-audit/Manifest
@@ -0,0 +1 @@
+DIST bundler-audit-0.3.1.gem 47104 SHA256 ee1101bda2740e75f3cae29af1614664b18f51193a235cc8b4042449dfb4eb0c SHA512 e27714d1edf8681b38433a64087c6c6ccb2d073bd807d2eed2f4153188b8151b98ffd9e5979827752b83f1b1fab09399d3421acc1045355439b2d95c500a7b32 WHIRLPOOL abe8ebf9f8cce2e9e7ee4c27fb0549190eafe6113e9ce54b74229d1ac1de38e71b490df5b1137c78665b642add18fafeebccfafa39744942e589bc02ed542d7b
diff --git a/dev-ruby/bundler-audit/bundler-audit-0.3.1.ebuild b/dev-ruby/bundler-audit/bundler-audit-0.3.1.ebuild
new file mode 100644
index 000000000000..31ce0a3af596
--- /dev/null
+++ b/dev-ruby/bundler-audit/bundler-audit-0.3.1.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-ruby/bundler-audit/bundler-audit-0.3.1.ebuild,v 1.1 2015/06/26 15:23:09 zerochaos Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/rubysec/bundler-audit"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+RESTRICT="test"
+
+ruby_add_rdepend "dev-ruby/thor dev-ruby/bundler"
diff --git a/dev-ruby/bundler-audit/metadata.xml b/dev-ruby/bundler-audit/metadata.xml
new file mode 100644
index 000000000000..29a13f951171
--- /dev/null
+++ b/dev-ruby/bundler-audit/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ruby</herd>
+<longdescription lang="en">
+</longdescription>
+</pkgmetadata>
diff --git a/dev-ruby/daemons/Manifest b/dev-ruby/daemons/Manifest
index 80ed8215cef3..8e3e35bfcc4f 100644
--- a/dev-ruby/daemons/Manifest
+++ b/dev-ruby/daemons/Manifest
@@ -1,3 +1,4 @@
 DIST daemons-1.1.8.gem 32768 SHA256 d2a29058ef21a67db413bbc365d91c9d827bcd8ee3186eb2edacc723aff0cb54 SHA512 01e2c47bb6a66d4a9be29a7789548cb6c914ec89f6bd3b7b24ef03957ef6695c1c5e279ec49b5336e08674399fb97ae9f0ef3e1a0ced792b6b736d19f2d6b002 WHIRLPOOL 991568c6fac60c3ce64a1f9247753ba4cedee44ceef26b103370a9d1f7d33fdce54f20e8b13f3c6eb0d48ff168ab8f204e2a3adc74c41f4d6b746c5025d498f1
 DIST daemons-1.1.9.gem 32768 SHA256 fee738586059ac5051ed89b40b63d02bdc9a19254f9b6e58848dea1c2f3135c8 SHA512 7f29162c7cb728ae27dbd16a9bc5191bb617b6cfacd1c698d2bbe43d335224b1ad59eea36205331abb9b3586c454e584333c6464f5afc033c48e676db6983f45 WHIRLPOOL 9335fde9642212f499449da75ae664443647f7a03622e75b8e71151b5db9d054ebb3d7c499ef734abb6b313543b5a6563a53412a7d2efdf5c2a3460703878e64
 DIST daemons-1.2.2.gem 24576 SHA256 c3b2d10a8c700b144bc47eb58d7b9d1ce1d8f96cbb27a35e576bbc1ae73e2c88 SHA512 771e9d09f305cacede9337b15e4b55474549f512c0f004aebea8630d1b4c77f3e8486644c569b65bd8137161e71171c48a34a7807ad53bfce6bacc8d1596466e WHIRLPOOL a328b8095f093d94078b51f7f34c3f1fd431def937d92e45a4a2d6cb8d79b82e4b930fc62697b754099b688a546bd306396c37d291860a83bba2556c98dd1241
+DIST daemons-1.2.3.gem 24576 SHA256 0fbf1f7ef654e98fac324b43ab690576fbe8b66941693b473f4f27ef334c032d SHA512 05acecc07bc3f760472453dd11eb0231b9e7f2e04a783ab44dacecf9c666d01122d27fdb782d9973f475bc378e0e3e51795ad58e221f29b201b1ba5e0de1e277 WHIRLPOOL 9568c383912195964b0079df60f8342268a51d75c0251b50e5c747759b82463d3d79a597e593a24ee84eb8618a637bcb22cb842b7c9a43d67db1f0be41c72e5c
diff --git a/dev-ruby/daemons/daemons-1.2.3.ebuild b/dev-ruby/daemons/daemons-1.2.3.ebuild
new file mode 100644
index 000000000000..2f5f48880c44
--- /dev/null
+++ b/dev-ruby/daemons/daemons-1.2.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/daemons/daemons-1.2.3.ebuild,v 1.1 2015/06/27 05:39:43 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_EXTRADOC="Releases README.md"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Wrap existing ruby scripts to be run as a daemon"
+HOMEPAGE="https://github.com/thuehlinger/daemons"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="examples"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	use examples || return
+
+	insinto /usr/share/doc/${PF}/
+	doins -r examples
+}
diff --git a/dev-ruby/exifr/Manifest b/dev-ruby/exifr/Manifest
index 81d3c86d5661..e6adbf68a493 100644
--- a/dev-ruby/exifr/Manifest
+++ b/dev-ruby/exifr/Manifest
@@ -1,3 +1 @@
-DIST exifr-1.2.0.gem 224768 SHA256 a0b8bea215a83b3ca40f26c8fce5eba8f45456d015d47f35be3bcf294dc3a5f6 SHA512 e32bbdd5d8de0a4e725fb45c39e4418e88f86674cd62a65330152dca8743b97f43d43eac5f5622d551e17784319ddd243d96a60c69def34d7f237c87b7480bcd WHIRLPOOL 72b3896db06d5e69336f00a521c646c11c228e8a5bb86c7e26adaf494c23708177272ad81a66d88656387c15338af1c9d100e145ad4a19d0b3c53dc7f296d731
-DIST exifr-1.2.1.gem 224768 SHA256 3ac66e2102334657e502124109ab0bf24691444440554e9817ad633de61ba911 SHA512 470aff1d5cc870d99002d18cc0b4361c95c2a5ade73a827328399dce7bb85cb489f2f482234379441afaaa238f2f6e8a220871f662c55f144a5f6e886d853dad WHIRLPOOL 56708f57f07722bcccb52ae5bc00f2026b99007a63ccf75abacaf2a013d10f97f96d5d5e987d67a8466c25bbb62d69a7c584e49598611f2313070f07eea00e2a
 DIST exifr-1.2.2.gem 230400 SHA256 bbb0f97db4fd686894eafd0335d171f2da868ee680dbb213743ed68cf18e0508 SHA512 91f1aeb19064ca5462335046d335e7e346fe87adb8a86d09a6a4affeba835f875c8a92bf64eefa840c1fd753a9f2f1ce871eedce605274885968d8e9227325e8 WHIRLPOOL 86579dd394501724cef33b17acafa88f4fd45fd0da3998fd8088b5f5d0af6c5bb9854ca1fbda232b48d1d317dcc36b1310cee11a830976cfb4f523dca8c03000
diff --git a/dev-ruby/exifr/exifr-1.2.0.ebuild b/dev-ruby/exifr/exifr-1.2.0.ebuild
deleted file mode 100644
index 990fda8b0030..000000000000
--- a/dev-ruby/exifr/exifr-1.2.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/exifr/exifr-1.2.0.ebuild,v 1.3 2015/02/01 12:06:12 graaff Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_DOCDIR="doc/api"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library to read EXIF info from JPEG and TIFF images"
-HOMEPAGE="http://exifr.rubyforge.org/"
-
-# License is not specified in source distribution but is in the GitHub
-# repository.
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-ruby/exifr/exifr-1.2.1.ebuild b/dev-ruby/exifr/exifr-1.2.1.ebuild
deleted file mode 100644
index c9722fc94aca..000000000000
--- a/dev-ruby/exifr/exifr-1.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/exifr/exifr-1.2.1.ebuild,v 1.1 2015/03/03 18:21:31 mrueg Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-RUBY_FAKEGEM_DOCDIR="doc/api"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library to read EXIF info from JPEG and TIFF images"
-HOMEPAGE="http://exifr.rubyforge.org/"
-
-# License is not specified in source distribution but is in the GitHub
-# repository.
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 7ba0b6194643..ba1a51bc3335 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,2 +1,3 @@
 DIST ffi-git-1.9.6.tgz 895468 SHA256 b27a59bf2eddcc17abaf7063a64e527fa892ba95cdb6320aba6fa945c769c9c7 SHA512 4b690b70db41642be679f13b33a67e27e1a4b14ca56d6ce355ea0a300c793a63e1081fb19d4c4bd395c1bea55a1669b96e3405932fffeebd328809a410fe3e8f WHIRLPOOL 7f5ad8d7766b037e24cff4721db02f05b39604c1be5e07ddad9de4a5155124d2a05ebd43209dfc2491cdc50ea08e5cda856f7502bf1c12666fa19b77516c81f7
 DIST ffi-git-1.9.8.tgz 897533 SHA256 0f5882e60ab6937ad2ef9466545510a4a7fb7b05b571262d147190f656cc90de SHA512 636de8df5de0854a012799f4bd877e30929bf8338f200ff94710e5d31ebc0b8721e09a2459cda0d889f389fa78242b8526f072edaf546c1b9ba7c142d4e109e5 WHIRLPOOL 9f950c27874c178994103508331fc4289a7ad8de02aec5af05ee0190c536ce676c532ea425f81cb69c26fb0b28ab5510322f12103af61a8898d3861f37bc69e8
+DIST ffi-git-1.9.9.tgz 897511 SHA256 80d4d2c2ec6777f29a5de375c44009fd27963be0e6db6aa1db71463ec2de5a06 SHA512 4dc88c1468c99c27a5a02fa6292134fd557b74fdd74cbabfe7711c2089711abf1ef60d1c21bb2c9e1865848c52ed495a7de540ce77c12de0eca303add9fd81b5 WHIRLPOOL 604bf78679c5f4ecf11fb8fb9fbbff5f85f29e475d0493f3d8f3b8e803dca1d1774ebd5cfee9448b6ea53137a745538f1d1b434ba8d3935a7eeb0cfde2fe6c4a
diff --git a/dev-ruby/ffi/ffi-1.9.9.ebuild b/dev-ruby/ffi/ffi-1.9.9.ebuild
new file mode 100644
index 000000000000..816ad5b1d856
--- /dev/null
+++ b/dev-ruby/ffi/ffi-1.9.9.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-ruby/ffi/ffi-1.9.9.ebuild,v 1.1 2015/06/27 05:45:24 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
+HOMEPAGE="https://wiki.github.com/ffi/ffi"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+IUSE=""
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+
+RDEPEND+=" virtual/libffi"
+DEPEND+=" virtual/libffi"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+	sed -i -e '/tasks/ s:^:#:' \
+		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
+
+	# Fix Makefile for tests
+	sed -i -e '/CCACHE :=/ s:^:#:' \
+		-e 's/-O2//' \
+		-e 's/^CFLAGS =/CFLAGS +=/' libtest/GNUmakefile || die
+
+	# Remove bundled version of libffi.
+	rm -rf ext/ffi_c/libffi || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/ffi_c extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake -Cext/ffi_c V=1
+	cp ext/ffi_c/ffi_c.so lib/ || die
+
+	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
+}
+
+each_ruby_test() {
+	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc samples/*
+}
diff --git a/dev-ruby/gherkin/gherkin-2.12.0-r3.ebuild b/dev-ruby/gherkin/gherkin-2.12.0-r3.ebuild
index fab11098322d..ef77ec133da8 100644
--- a/dev-ruby/gherkin/gherkin-2.12.0-r3.ebuild
+++ b/dev-ruby/gherkin/gherkin-2.12.0-r3.ebuild
@@ -1,9 +1,9 @@
-# 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-ruby/gherkin/gherkin-2.12.0-r3.ebuild,v 1.1 2014/08/16 07:43:37 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.12.0-r3.ebuild,v 1.2 2015/06/28 09:10:40 graaff Exp $
 
 EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_TASK_TEST=""
@@ -30,7 +30,7 @@ ruby_add_bdepend "
 	test? (
 		>=dev-ruby/builder-2.1.2
 		>=dev-util/cucumber-1.1.3
-		>=dev-ruby/rspec-2.6.0
+		>=dev-ruby/rspec-2.6.0:2
 		>=dev-ruby/term-ansicolor-1.0.5
 	)
 	doc? ( >=dev-ruby/yard-0.8.3 )"
@@ -73,6 +73,9 @@ all_ruby_prepare() {
 
 	# Avoid implicit dependency on git
 	sed -i -e 's/git ls-files/echo/' gherkin.gemspec || die
+
+	# Fix deprecated code removed in ruby22
+	sed -i -e 's/Config/RbConfig/' tasks/ragel_task.rb || die
 }
 
 all_ruby_compile() {
@@ -88,6 +91,6 @@ each_ruby_compile() {
 }
 
 each_ruby_test() {
-	${RUBY} -I lib -S rake spec || die "Specs failed"
+	${RUBY} -I lib -S rspec-2 spec || die "Specs failed"
 	CUCUMBER_HOME="${HOME}" RUBYLIB=lib ${RUBY} -S cucumber features || die "Cucumber features failed"
 }
diff --git a/dev-ruby/gherkin/gherkin-2.12.2.ebuild b/dev-ruby/gherkin/gherkin-2.12.2.ebuild
index d17ea0db5eae..e4926cb5add6 100644
--- a/dev-ruby/gherkin/gherkin-2.12.2.ebuild
+++ b/dev-ruby/gherkin/gherkin-2.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/dev-ruby/gherkin/gherkin-2.12.2.ebuild,v 1.1 2015/06/24 05:37:27 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/gherkin/gherkin-2.12.2.ebuild,v 1.2 2015/06/28 10:36:19 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 ruby22"
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/cucumber/gherkin"
 LICENSE="MIT"
 SRC_URI="https://github.com/cucumber/gherkin/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64"
 SLOT="0"
 IUSE="doc test"
 
diff --git a/dev-ruby/mustache/Manifest b/dev-ruby/mustache/Manifest
index 27f16c7b072e..8528015be1b4 100644
--- a/dev-ruby/mustache/Manifest
+++ b/dev-ruby/mustache/Manifest
@@ -1,2 +1,3 @@
 DIST mustache-0.99.5.gem 41472 SHA256 c84be205017ada80aa4d4ad16b7af4bd89f840b26125a0e8eead5a914d279005 SHA512 fa85db8a2d0beea5bac93bf4214db0b65d275b7a01b4a16dbfcab0084d6a7701060d7b7cf090901830fbae2db5caa1973af427396407040053af9966782b55ef WHIRLPOOL 2c8562417ecaf1abe3073ba6a47053692f844e4e66bee7c1ea0893f908dd9f2db304a5d0de5ebe25f6866e312a1a8b6c0dfe1d9cfa5654513cb9578060af1bab
 DIST mustache-1.0.1.gem 40960 SHA256 42412df1754bed24f0238efb561e51c2c53b8ea3ab003819723481a73a60ae27 SHA512 de4611c2c913fe64e688f7995feb4ce9809e28bedcab43ec2f355aed8ebc1e1c7dcc7433bd36c6b3fc37295d59316f411aaecdd5d13fb64d4d63be1d67ac5c80 WHIRLPOOL 9d5f5709f2f745402dc2d3339dca42c360c37cadc145417a0d557f6d3fc489a373c5427488ec62b87b1e1576de09c1c52b3c5b9ac5f80e4ab69a25ba3c949b9c
+DIST mustache-1.0.2.gem 40960 SHA256 e79dbc8bae087011ace17bfbc4ee1e652b1d5efa5d56316b09b7c2256f447d34 SHA512 4bc50bf67317e9815b125c25cd94b6c6943b4c7cdeeae3118d29b002279386f00f73a38bfcba9072253cd389634c44a8da9aba775989ab235a444796e4634450 WHIRLPOOL 310359b29b8e9a948c92e9e82045ca7b2f8f01e52c63c13d345bc01c4b3ea5949d3f765d301e9cc209facb59748f459fadb98ac91bc6edfe50f1ba9026ab5f32
diff --git a/dev-ruby/mustache/mustache-1.0.2.ebuild b/dev-ruby/mustache/mustache-1.0.2.ebuild
new file mode 100644
index 000000000000..84caccfd7eab
--- /dev/null
+++ b/dev-ruby/mustache/mustache-1.0.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mustache/mustache-1.0.2.ebuild,v 1.1 2015/06/27 21:37:21 mrueg Exp $
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC="man:build"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Mustache is a framework-agnostic way to render logic-free views"
+HOMEPAGE="http://mustache.github.com/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+ruby_add_bdepend "doc? ( app-text/ronn )"
+
+all_ruby_prepare() {
+	# Fix rake deprecation
+	sed -i -e 's:rake/rdoctask:rdoc/task:' Rakefile || die
+
+	# Avoid code climate dependency.
+	sed -i -e '/codeclimate/I s:^:#:' test/helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:. -e "Dir['test/*.rb'].each{|f| require f}" || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/mustache.1 man/mustache.5
+}
diff --git a/dev-ruby/rack/rack-1.4.6.ebuild b/dev-ruby/rack/rack-1.4.6.ebuild
index 5c3cb2fa8b47..ab64ed7147ff 100644
--- a/dev-ruby/rack/rack-1.4.6.ebuild
+++ b/dev-ruby/rack/rack-1.4.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-ruby/rack/rack-1.4.6.ebuild,v 1.5 2015/06/24 09:00:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.4.6.ebuild,v 1.6 2015/06/28 09:07:47 maekke Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -17,7 +17,7 @@ HOMEPAGE="http://rack.github.com/"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_PATCHES=( ${PN}-1.2.1-gentoo.patch ${PN}-1.4.5-fix-test-ruby20.patch )
diff --git a/dev-ruby/rack/rack-1.5.4.ebuild b/dev-ruby/rack/rack-1.5.4.ebuild
index 6e3cc55f0808..08430bfffe27 100644
--- a/dev-ruby/rack/rack-1.5.4.ebuild
+++ b/dev-ruby/rack/rack-1.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/dev-ruby/rack/rack-1.5.4.ebuild,v 1.5 2015/06/24 09:00:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rack/rack-1.5.4.ebuild,v 1.6 2015/06/28 09:08:16 maekke Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -17,7 +17,7 @@ HOMEPAGE="http://rack.github.com/"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_PATCHES=( ${PN}-1.2.1-gentoo.patch )
diff --git a/dev-ruby/railties/railties-4.1.10.ebuild b/dev-ruby/railties/railties-4.1.10.ebuild
index 546a4aa7edb8..20830f3f3d15 100644
--- a/dev-ruby/railties/railties-4.1.10.ebuild
+++ b/dev-ruby/railties/railties-4.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-ruby/railties/railties-4.1.10.ebuild,v 1.2 2015/03/31 19:22:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-4.1.10.ebuild,v 1.3 2015/06/27 20:39:55 mrueg Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -31,7 +31,7 @@ RUBY_S="rails-${PV}/${PN}"
 # investigation.
 RESTRICT="test"
 
-RDEPEND+=">=app-eselect/eselect-rails-0.19"
+RDEPEND+=" >=app-eselect/eselect-rails-0.20"
 
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
diff --git a/dev-ruby/railties/railties-4.1.11.ebuild b/dev-ruby/railties/railties-4.1.11.ebuild
index 67516f5e703d..47d03e9c59dd 100644
--- a/dev-ruby/railties/railties-4.1.11.ebuild
+++ b/dev-ruby/railties/railties-4.1.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/dev-ruby/railties/railties-4.1.11.ebuild,v 1.1 2015/06/16 21:36:31 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-4.1.11.ebuild,v 1.2 2015/06/27 20:39:55 mrueg Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -31,7 +31,7 @@ RUBY_S="rails-${PV}/${PN}"
 # investigation.
 RESTRICT="test"
 
-RDEPEND+=">=app-eselect/eselect-rails-0.19"
+RDEPEND+=" >=app-eselect/eselect-rails-0.20"
 
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
diff --git a/dev-ruby/railties/railties-4.1.12.ebuild b/dev-ruby/railties/railties-4.1.12.ebuild
index e8e78ef9c9df..9bdec289f8ef 100644
--- a/dev-ruby/railties/railties-4.1.12.ebuild
+++ b/dev-ruby/railties/railties-4.1.12.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/railties/railties-4.1.12.ebuild,v 1.1 2015/06/26 06:27:51 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-4.1.12.ebuild,v 1.2 2015/06/27 20:39:55 mrueg Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -31,7 +31,7 @@ RUBY_S="rails-${PV}/${PN}"
 # investigation.
 RESTRICT="test"
 
-RDEPEND+=">=app-eselect/eselect-rails-0.19"
+RDEPEND+=" >=app-eselect/eselect-rails-0.20"
 
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
diff --git a/dev-ruby/railties/railties-4.2.1.ebuild b/dev-ruby/railties/railties-4.2.1.ebuild
index d5e4e84e5e44..0037074edc81 100644
--- a/dev-ruby/railties/railties-4.2.1.ebuild
+++ b/dev-ruby/railties/railties-4.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/dev-ruby/railties/railties-4.2.1.ebuild,v 1.2 2015/03/31 19:22:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-4.2.1.ebuild,v 1.3 2015/06/27 20:38:30 mrueg Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -31,7 +31,7 @@ RUBY_S="rails-${PV}/${PN}"
 # investigation.
 RESTRICT="test"
 
-RDEPEND+=">=app-eselect/eselect-rails-0.19"
+RDEPEND+=">=app-eselect/eselect-rails-0.21"
 
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
diff --git a/dev-ruby/railties/railties-4.2.2.ebuild b/dev-ruby/railties/railties-4.2.2.ebuild
index 43c876cfc64d..73f26a7e5691 100644
--- a/dev-ruby/railties/railties-4.2.2.ebuild
+++ b/dev-ruby/railties/railties-4.2.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-ruby/railties/railties-4.2.2.ebuild,v 1.1 2015/06/16 22:00:01 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-4.2.2.ebuild,v 1.2 2015/06/27 20:38:30 mrueg Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -31,7 +31,7 @@ RUBY_S="rails-${PV}/${PN}"
 # investigation.
 RESTRICT="test"
 
-RDEPEND+=">=app-eselect/eselect-rails-0.19"
+RDEPEND+=">=app-eselect/eselect-rails-0.21"
 
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
diff --git a/dev-ruby/railties/railties-4.2.3.ebuild b/dev-ruby/railties/railties-4.2.3.ebuild
index aeb9503532af..bd1fdd21145f 100644
--- a/dev-ruby/railties/railties-4.2.3.ebuild
+++ b/dev-ruby/railties/railties-4.2.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/railties/railties-4.2.3.ebuild,v 1.1 2015/06/26 08:33:54 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-4.2.3.ebuild,v 1.2 2015/06/27 20:38:30 mrueg Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21"
@@ -31,7 +31,7 @@ RUBY_S="rails-${PV}/${PN}"
 # investigation.
 RESTRICT="test"
 
-RDEPEND+=">=app-eselect/eselect-rails-0.19"
+RDEPEND+=">=app-eselect/eselect-rails-0.21"
 
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
diff --git a/dev-ruby/rake-remote_task/Manifest b/dev-ruby/rake-remote_task/Manifest
index 01fa3076a823..2dc5306ba903 100644
--- a/dev-ruby/rake-remote_task/Manifest
+++ b/dev-ruby/rake-remote_task/Manifest
@@ -1,2 +1,3 @@
 DIST rake-remote_task-2.2.1.gem 16896 SHA256 26e7f076540a8f1fc7f2dd3796753dfa958e40b26b05ba5532a3aad1fbeb3d95 SHA512 b01b6b393a0d2887b664b9567945d74766e5f5fb790d66960c66436a08c26b3ec739a0fe35317592f7c63cfc2aec687b69eca52fc52ec4151c62724044b43468 WHIRLPOOL e8915bc0896437d403b5941e22831c3f311330838cef806e7e4d2858eb29d9720582af9cf327d7de2d49c0340d6e33216daf286c0723d46c2130fee69f002ad5
 DIST rake-remote_task-2.2.2.gem 18944 SHA256 ca01188a5e9a94cc3cf9c5c8c455508ae3ac059aafe98c53427ef3f5e3c74043 SHA512 f26bdd63686587b111983fbb6d1a7e449785ea25b8c7facda71fa686fd091a021a1a75b2341163e73f215b5897ea64c355ffaed312d3db74308afe890a334eae WHIRLPOOL 043df936695763a1eeb0546225415491db74ef68a4c2924404c41ef2bdee89ce91a5a560dd69c2da50ca80a9ef35a976a8a4c10591756c29e75324041463617f
+DIST rake-remote_task-2.3.0.gem 18944 SHA256 7b70ae6293ed38ffa7794f7dfeebd54c039f69a691263a3cd2f6412ff7e7af26 SHA512 345c5e3f9a0f3eddc989733594a85fc7a5c6e31cb5288588854aa5866508529611c4e9cf2523ddb20ef4661c71243b5b72d199b7603d34fba851aa9544860949 WHIRLPOOL 41df09af7ccecc8fe353284c9eeaf32e1376dbd54a4c73bfc2d4974007956eebd977931802ae4cd5765e9d0893950b32a0b4d25e1bce594ea0a74de6640cff97
diff --git a/dev-ruby/rake-remote_task/rake-remote_task-2.3.0.ebuild b/dev-ruby/rake-remote_task/rake-remote_task-2.3.0.ebuild
new file mode 100644
index 000000000000..e3cfe908606c
--- /dev/null
+++ b/dev-ruby/rake-remote_task/rake-remote_task-2.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rake-remote_task/rake-remote_task-2.3.0.ebuild,v 1.1 2015/06/27 05:51:30 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Vlad the Deployer's sexy brainchild is rake-remote_task, extending Rake with remote task goodness"
+HOMEPAGE="http://rubyhitsquad.com/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_bdepend ">=dev-ruby/hoe-2.9.2
+	test? ( dev-ruby/minitest )"
+ruby_add_rdepend ">=dev-ruby/open4-1.0"
+
+all_ruby_prepare() {
+	sed -i -e '/isolate/ s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/rbpdf/Manifest b/dev-ruby/rbpdf/Manifest
index 1da1700516ab..a1181c85dec8 100644
--- a/dev-ruby/rbpdf/Manifest
+++ b/dev-ruby/rbpdf/Manifest
@@ -1 +1 @@
-DIST rbpdf-1.18.5.gem 5734912 SHA256 ec2c8204a42081c3e22f48c4061c532ab87f28c41b601afa7d295ef8b5afbbc1 SHA512 ab3b58703523450cc12941d19e4af770a921b90f693621100fb81f164be1dc739aa0bccdfe806fc0f3dd9c174c1b6afa7d6834972d52df165ca064e20c5cdcbd WHIRLPOOL dd40db5ddcd1ed5deaa329b796442040fdceb76ed43f044ba88aaab60dc45eccfabc8e1df4674b4a56fd5e680584caad1fae867cf2edac5ae195821ea3191e58
+DIST rbpdf-1.18.6.gem 5764096 SHA256 d5d1e30ad1465bea5b3c1809cf2789c6795dafbfba6c2cab40c628989229b650 SHA512 a2c30082211d4b170c7cfea72f839541364d7e6b9da29b33a489a5900f63f2cc6ccb85c099ba2f090eec96c79c50026195f9a4a03c04274eea691188271b839b WHIRLPOOL 100c7ba0c7e21edf669d5a82ea8172f886dc9b804b4ecd93ae43b0baa25e3d2f15ce80f91cefa6b6400a0c829830780a3d7a4c7d9473895d25f2ba3720916107
diff --git a/dev-ruby/rbpdf/rbpdf-1.18.5.ebuild b/dev-ruby/rbpdf/rbpdf-1.18.5.ebuild
deleted file mode 100644
index f6374e519ffb..000000000000
--- a/dev-ruby/rbpdf/rbpdf-1.18.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rbpdf/rbpdf-1.18.5.ebuild,v 1.1 2015/04/11 02:59:00 mjo Exp $
-
-EAPI=5
-
-# As long as we conditionally depend on dev-ruby/rails:3.2, we're
-# helpless to add ruby21 or ruby22 support. It should be possible, it
-# just hasn't happened yet. See https://github.com/naitoh/rbpdf/issues/9
-USE_RUBY="ruby19 ruby20"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby on Rails TCPDF plugin"
-HOMEPAGE="https://github.com/naitoh/rbpdf"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# We need to set up a fake Rails environment to run the tests.
-ruby_add_bdepend "test? ( dev-ruby/rails:3.2 )"
-
-src_test() {
-	# Create a fake Rails environment once, then do the default ruby-ng
-	# thing. Make sure we use the rails-3.x.y executable.
-	local rails="${ROOT}usr/bin/rails-3.2*"
-
-	$rails new "${T}/dummy" \
-		  --skip-javascript \
-		  --skip-git \
-		  --skip-bundle \
-		  --skip-sprockets \
-		  --skip-active-record \
-		|| die "failed to create rails environment"
-
-	ruby-ng_src_test
-}
-
-each_ruby_test() {
-	# The test suite needs to run within a Rails environment, so in
-	# src_test(), we created an empty Rails instance in ${T}/dummy. Now
-	# we copy ourselves into the vendor/plugins directory of that Rails
-	# instance, and run the tests using Rails's Rakefile. Assuming the
-	# tests pass, we remove the plugin again so everything is nice and
-	# tidy for the next ruby implementation.
-	cp -r . "${T}/dummy/vendor/plugins/${PN}" || \
-		die "failed to install plugin"
-	cd "${T}/dummy" || die
-	rake test TEST="vendor/plugins/${PN}/test/*_test.rb" || \
-		die "test suite failed"
-	rm -r "vendor/plugins/${PN}" || die "failed to uninstall plugin"
-}
diff --git a/dev-ruby/rbpdf/rbpdf-1.18.6.ebuild b/dev-ruby/rbpdf/rbpdf-1.18.6.ebuild
new file mode 100644
index 000000000000..afbdfcae1492
--- /dev/null
+++ b/dev-ruby/rbpdf/rbpdf-1.18.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rbpdf/rbpdf-1.18.6.ebuild,v 1.1 2015/06/27 23:54:14 mjo Exp $
+
+EAPI=5
+
+# ruby22 support waiting on dev-ruby/action{pack,view}.
+# ruby21 works, but not while we support rails-3.2.
+USE_RUBY="ruby19 ruby20"
+
+# Avoid the complexity of the "rake" recipe and run the tests manually.
+RUBY_FAKEGEM_RECIPE_TEST=none
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby on Rails TCPDF plugin"
+HOMEPAGE="https://github.com/naitoh/rbpdf"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+# Try to pick the right version of minitest. Conflicts are still
+# possible, but this is probably the best we can do...
+ruby_add_bdepend "test? ( || (
+	( dev-ruby/actionpack:3.2 dev-ruby/minitest:0 )
+	( dev-ruby/actionpack:4.0 dev-ruby/minitest:0 )
+	( dev-ruby/actionview:*   dev-ruby/minitest:5 )
+) )"
+
+# We need the action_view gem; it was split out of actionpack in 4.1.
+ruby_add_rdepend "|| (
+	dev-ruby/actionpack:3.2
+	dev-ruby/actionpack:4.0
+	dev-ruby/actionview:*
+)"
+
+all_ruby_prepare(){
+	default
+
+	# This test is enabled automagically in the presence of rmagick, and
+	# then fails.
+	rm -f test/rbpdf_image_rmagick_test.rb \
+		|| die "failed to remove rmagick tests"
+}
+
+each_ruby_test() {
+	local cmd='gem "minitest"'
+	cmd+=' and '
+	cmd+='require "minitest/autorun"'
+	cmd+=' and '
+	cmd+='Dir["test/**/*_test.rb"].each{|f| require f}'
+	${RUBY} -Ilib:.:test -e "${cmd}" || die "test suite failed"
+}
diff --git a/dev-ruby/rspec-core/Manifest b/dev-ruby/rspec-core/Manifest
index d90a4dbd5e46..be2f71095819 100644
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@@ -4,3 +4,4 @@ DIST rspec-core-3.1.7-git.tgz 244774 SHA256 5fbb0b965bd590972bbf57272dbaf026e674
 DIST rspec-core-3.2.0-git.tgz 275656 SHA256 a4b4400f08b9afbad1d9956a2ce54d380d552fb513bd6db91eeccbf90b46f95b SHA512 ce20a12c5b44cb1f62c119fe466eea03d9772b4a3127a00f60aa49daededb68d588ad791ff3b097bcdb854fce00c41a1cc054b8a5babdb4ca1f2fc0f2306549f WHIRLPOOL 99cf1286075f37c30112514ce41c34cfef5bfa2549bd6fd3e3bc6a5a70c366181f06044b8655136c43dee54218cc946a6579c4e5577f07feaedadc65d6ef3a44
 DIST rspec-core-3.2.1-git.tgz 275760 SHA256 881136de98c27876f4b10c0857b2eb506c4a70249c60ebc9268766d885c75659 SHA512 dd323ad399d037032326a403e33786c62a7bd4fe3f98796aa60781c625632ab3e511f3a86cbe3bf897ec4558cf0c20296016cc317c8401cf7f99fc5b6cf3d44a WHIRLPOOL 607c6855c8b7a8ab4c44bb47c600c1e46521c68c12fd87fd3b04caedc74cc7a4820e48f6f76e833a9bb5add392ae3bc080e521261db220e84bbfa8f9edb9fc78
 DIST rspec-core-3.2.3-git.tgz 276647 SHA256 7122fe372cdf0d4ff60aef42768fc9cc0350bd1943f5c1fa6189153829519ab2 SHA512 a5eb294c4770275662205b4edde2426c7d7ab7f9fb3cea6fc1171071b941a94b6d6386348fd83ba9e76a35512ea56be0b657ba2d8e210fe73c8564e76ebea7ae WHIRLPOOL 895d5fab418ddc5adc9a33078499f59b2865b636516110f0042bd08b4d9ecdb304f135655c0b05102f47725b94da831c986889b8a76eed3e8aa2c693f2d29d63
+DIST rspec-core-3.3.1-git.tgz 332355 SHA256 9dc839186e72fe5d4b4f15500bc2a976d08dc4af859be2b69778b1c4f84d321b SHA512 cddbfc1dae98de2db31a5f9c5a60cf1cdd4995f35bcd1bea525f18fc8b3649d7c8a2e23169873874be22b4f75b14b89d086e2372ed1dd93a157ae03c5989a760 WHIRLPOOL a3e5fa2264b40313c1fcf1890087f218a5a9f442f82528f4422a315858a036ff36cdc671dbb7e1f4d937385e6568cb7950c43ab7249c78b834ba07e5dae671d6
diff --git a/dev-ruby/rspec-core/rspec-core-3.3.1.ebuild b/dev-ruby/rspec-core/rspec-core-3.3.1.ebuild
new file mode 100644
index 000000000000..157577106246
--- /dev/null
+++ b/dev-ruby/rspec-core/rspec-core-3.3.1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-core/rspec-core-3.3.1.ebuild,v 1.1 2015/06/28 06:00:51 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+RUBY_FAKEGEM_TASK_DOC="none"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+# Also install this custom path since internal paths depend on it.
+RUBY_FAKEGEM_EXTRAINSTALL="exe"
+
+RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-core"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="highlight"
+
+SUBVERSION="$(get_version_component_range 1-2)"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-support-${SUBVERSION}*
+	!!<dev-ruby/rspec-core-2.14.8-r4
+	highlight? ( >=dev-ruby/coderay-1.0.9 )
+"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/nokogiri-1.5.2
+		>=dev-ruby/coderay-1.0.9
+		dev-ruby/syntax
+		>=dev-ruby/zentest-4.6.2
+		>=dev-ruby/rspec-expectations-3.3.0:3
+		>=dev-ruby/rspec-mocks-2.99.0:3
+	)"
+
+# Skip yard for ruby22 for now since we don't support ruby22 eselected
+# yet and we can't bootstrap otherwise.
+USE_RUBY=${USE_RUBY/ruby22/} ruby_add_bdepend "doc? ( dev-ruby/yard )"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Avoid dependency on cucumber since we can't run the features anyway.
+	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
+
+	# Duplicate exe also in bin. We can't change it since internal stuff
+	# also depends on this and fixing that is going to be fragile. This
+	# way we can at least install proper bin scripts.
+	cp -R exe bin || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e '/git ls-files/ s:^:#:' rspec-core.gemspec || die
+
+	# Avoid aruba dependency so that we don't end up in dependency hell.
+	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
+	rm spec/integration/{filtering,order,persistence_failures}_spec.rb spec/support/aruba_support.rb || die
+
+	# Avoid a spec failing due to path issues
+	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
+		spec/rspec/core/configuration_spec.rb || die
+}
+
+each_ruby_prepare() {
+	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
+
+	# case ${RUBY} in
+	# 	*ruby22)
+	# 		# The rubygems version bundled with ruby 2.2 causes warnings.
+	# 		sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/core_spec.rb || die
+	# 		;;
+	# esac
+}
+
+all_ruby_compile() {
+	if use doc ; then
+		yardoc || die
+	fi
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
+}
diff --git a/dev-ruby/rspec-expectations/Manifest b/dev-ruby/rspec-expectations/Manifest
index 228c12d4a6c8..dd34ae35c70d 100644
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@@ -3,3 +3,4 @@ DIST rspec-expectations-2.99.2-git.tgz 106884 SHA256 4c1b38198d214ab2d4e297fdfbd
 DIST rspec-expectations-3.1.2-git.tgz 148364 SHA256 ad50e3a305d9c5ac8939d7e1f61231ce694f2a01bddf1f43f297efa9e3b6431f SHA512 f02f205d3d79ab592b093f1ebd8f9a3b60c550d0aaea97cb5b442266ece904475aee55ea56c9cc4713d22f0e4ad2ead3494bfaf0ade1b345f3b1fc726ffd5b30 WHIRLPOOL a1e692b962a7f0e95598c624f671b1fea86a0a1e11e96b43259d74f8ac22ed184dbbf6e7517129b1c0f19069e35af99b92832d8d46f39211ff2ffd55c24f8f01
 DIST rspec-expectations-3.2.0-git.tgz 157134 SHA256 a7196fad1cd851ed84a4725c90335c211b282e312ac4983fdc9ea62bbc0fa09b SHA512 de3111ded0b4138527e1cff170d059dd4725b10cc770019c84efc7583332a76c8ef115fdb675cab5ae7068a73f55e9583db3b05b70565760e80bdf8b9645afe6 WHIRLPOOL 3cb43ee930bce097d2c43eabf2d1939a35a8a593a9f5e271a137d14a3f2bfdbb096c89b4f1327b1242920eac62da23537b194c35fac297ad79679b62e5853bb1
 DIST rspec-expectations-3.2.1-git.tgz 157533 SHA256 fd3813bb56818fcea59a71aec649546c33c3d10ad1473deb4b051ab8f2bd1940 SHA512 144609a9b148daeb95e23e421bdd00ba3571f6e751915ba699089d52567f9cd7a35a51be37772947d7fe59945281bf8c5afea6a68b6d0e87007266333342b773 WHIRLPOOL 5046afddb29a42b3456b25077d3f1f2be83e5db6a8e69c02e93711725466ecbe792c4670cd8bbd371e405b0706a1eaadb7c7d7b81df50c7c88732e98d1e32cf4
+DIST rspec-expectations-3.3.0-git.tgz 170643 SHA256 1bf5062cd45c12cfa048deb73caa572372767513fffe9f12328ffaf8970a0891 SHA512 edbe9ec9482fb93ba4834b023b3574f6771936a17df7b0f049b090b10077bb2d336a30a2bf734fa2d2f207b04bcb63be9a4e1a33c905d3614c93bec1a23be51c WHIRLPOOL 2a396b888261094efce98cea6d2359ce1b604801de20884b69f2b6f0c6ea16d0546ce9a5c101a10ad19ae225c498e6e80068958aef2ee12e350c31a228fcb0ef
diff --git a/dev-ruby/rspec-expectations/rspec-expectations-3.3.0.ebuild b/dev-ruby/rspec-expectations/rspec-expectations-3.3.0.ebuild
new file mode 100644
index 000000000000..84f0d57dd0b2
--- /dev/null
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.3.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-expectations/rspec-expectations-3.3.0.ebuild,v 1.1 2015/06/28 06:00:17 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-expectations"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SUBVERSION="$(get_version_component_range 1-2)"
+
+ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 <dev-ruby/diff-lcs-2
+	=dev-ruby/rspec-support-${SUBVERSION}*"
+
+ruby_add_bdepend "test? (
+		>=dev-ruby/rspec-mocks-3.2.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm Gemfile || die
+
+	# fix up the gemspecs
+	sed -i \
+		-e '/git ls/d' \
+		-e '/add_development_dependency/d' \
+		"${RUBY_FAKEGEM_GEMSPEC}" || die
+
+	#
+	sed -i -e '1irequire "spec_helper"' spec/rspec/expectations/configuration_spec.rb || die
+
+	# Avoid a weird, and failing, test testing already installed code.
+	sed -e '/has an up-to-date caller_filter file/,/end/ s:^:#:' -i spec/rspec/expectations_spec.rb || die
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby22)
+			# The rubygems version bundled with ruby 2.2 causes warnings.
+			sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/expectations_spec.rb || die
+			;;
+	esac
+}
diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 56b06600e5f9..d83f3f2d0c64 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -3,3 +3,4 @@ DIST rspec-mocks-2.99.2-git.tgz 101731 SHA256 fad961e30ef67e014625fb6b4bb62db0f6
 DIST rspec-mocks-3.1.3-git.tgz 149187 SHA256 94cbf0214a1ae856590a35eeb638d028388f4b4b4d12304011165f49f4088b95 SHA512 64d09a4c792c81b5e7a96c1316e4241a199b1b0e1b9e13a41c12ab8f76b73d007f2e2986446719b9c829c1c85955705858c0a605c869eeefd071162bcf76e9c6 WHIRLPOOL ae059a6e8567a5c918664444dbd779c9a925dc592739d7e3256a6f6b77579fc01e5bf38e0b4d7ebb533ab976e314dc0bb87eda9d720ed6565760d5d0f37df95c
 DIST rspec-mocks-3.2.0-git.tgz 162966 SHA256 b2781ddb095c804c5520cd47bdf4bf5d03506593bac1e85e9aeb404a2a2476fc SHA512 0f682d644597fdd85dd0aa63ed4ce2bdb85d5fbc05801c612ca8fc326aa19f249d0b981b325f03fcbb2d025d9bb26316610088ded2faba993bbdadba36859797 WHIRLPOOL f09f1eea7361e9e5e2c6f1c62da297ff06c825433e21ea453fd3bb235258fe2848ec1aa3cd7ae8f98fe588b0c85751b966eb31357c1773466df92a543053d6c1
 DIST rspec-mocks-3.2.1-git.tgz 162789 SHA256 4ff4e500cf46a6a90920f64b18f88a41a0c62808183f593f3b6ff616c1d3fdf7 SHA512 005eb4214a98104a9366a8974486813cc098c53352bc877133c2e6efeeac6b14a1ff9bbc8a57227bb42f73727f56dfd244674833505ae1c64d4c21dee70dd9fe WHIRLPOOL bc4559879d7e2c768fddb4e98e02bf17136a7b8759495d9d7d63d257388a95149d4ee32408f0a041593ead8807a5f8c193db22f95df0bae026e7a45f62999422
+DIST rspec-mocks-3.3.1-git.tgz 173312 SHA256 43f7a1de0f3fa2083af889f3a5be13b0629358bf53ee09aac61ddb53865f5914 SHA512 1ae4f6915a136ef238edc6561034bc756673c33cb3ea934253bc3b9718027cb7020cf29d125a2b95bc3dfbe49fa4d06762a2315fd9f62b590f23f5b80ca642c2 WHIRLPOOL 720c04a8bbbfd07573378f118ddafb223825efae39459c6cae09668a52942416794ad5e3514182855858823660d73513c25ad1946b863d5f7552721833b94eca
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.3.1.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.3.1.ebuild
new file mode 100644
index 000000000000..263b1788f9ec
--- /dev/null
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.3.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-mocks/rspec-mocks-3.3.1.ebuild,v 1.1 2015/06/28 05:59:39 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-mocks"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SUBVERSION="$(get_version_component_range 1-2)"
+
+ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-core-3.3.0:3
+		>=dev-ruby/rspec-expectations-2.99.0:3
+	)"
+
+all_ruby_prepare() {
+	# Don't set up bundler: it doesn't understand our setup.
+	sed -i -e '/[Bb]undler/d' Rakefile || die
+
+	# Remove the Gemfile to avoid running through 'bundle exec'
+	rm Gemfile || die
+
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	rm .rspec || die
+
+	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
+
+	# Avoid a weird, and failing, test testing already installed code.
+	sed -e '/has an up-to-date caller_filter file/,/end/ s:^:#:' -i spec/rspec/mocks_spec.rb || die
+
+	# Avoid failing specs in yield code. Not clear why verify would not
+	# be defined. We can revisit this later so we can move on with
+	# rspec-3 introduction for now.
+	rm spec/rspec/mocks/and_yield_spec.rb || die
+}
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby22)
+			# The rubygems version bundled with ruby 2.2 causes warnings.
+			sed -i -e '/a library that issues no warnings when loaded/,/^  end/ s:^:#:' spec/rspec/mocks_spec.rb || die
+			;;
+	esac
+}
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index dd816bb5704a..9e2db04ec921 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -3,3 +3,4 @@ DIST rspec-rails-2.99.0.tar.gz 78448 SHA256 81ff54e638432c2b734ebefd5398f646960b
 DIST rspec-rails-3.1.0.tar.gz 88945 SHA256 4a5c5c7b92bcd8b6e84e756d3619ec48e4ad362bffe2bd883999ec9696c0b157 SHA512 39c7bffab081e7a37e3c89eae623075193055ca10d5dbdd9f9f55acf821dc74ceb82b4771987cc52696057d403411dcd3d821a35ed2384b8f3f38a6ab88a28c5 WHIRLPOOL 5d77ba1f3386333c9e2725c44291dfa8dba68c9156d1a671ef910ee8438665eef45f93ef98777b40f44653ce2cb8794ffa745948a893c4d127e95b22fae293c8
 DIST rspec-rails-3.2.1.tar.gz 94674 SHA256 e9502682c1e7545b25190f29fd9f8d80e4c149a7904fa57b18523208d60fb1a6 SHA512 f755d22b85e13b43c0c8ab1ebfe2ccc9afc3b75080b6c292a265645aff914def2a113fca49685691ff87bdd12f2b5da33dc0fce6ebbb64f532232db953a39085 WHIRLPOOL e2ccedd526a4ad9bb5389fc9ee701a77bbb9443cef70cb6d6658cc08a8daf8413cdd8c177c02c35ae07b2e2e944927bc77367fba83a6a4a3b658d417ff38fd38
 DIST rspec-rails-3.2.3.tar.gz 97589 SHA256 d70416a471a6e83b10a3b2c18f2dcfcb22897306cc1b238bb47fb4b6ee824ecb SHA512 1efeea5b742c9ded10dfdf432439b05765773bc19bb127a68f5cabd16e35d6bbead79c51343a419de03b5fe36d3ccf3754916ec55e28d6d9bf095508f1233af8 WHIRLPOOL 502d944adc28e9ac5b78db924cc985213067af60d5d238675feacd6e5625c479a9d7870cd43c49c12aac928d11f9361e7f7e85211a25403794a73e6933af69c0
+DIST rspec-rails-3.3.2.tar.gz 102934 SHA256 efdfadb375e0a64b6a306482ab705bdd9f147ff8c6b1acebb1981e50d5043b1c SHA512 59d8c516e3b7b5138c08d6cc2d68e21078dec0b340f9c0f709c9fa9cb7c318718454a8e11737a3ff1f2e940fc7d8db425b36bffda6966ad5f270923ffb9345bc WHIRLPOOL 6501d7b3467dcbec069472e6510a8c48a0a50b5f02ad6be5336b8c0bd2f841e72d865a3a8260bc4ef47744f6fd39eb4554c0c14d47153b2c1dce829d446b3672
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.3.2.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.3.2.ebuild
new file mode 100644
index 000000000000..e7b27525e5d1
--- /dev/null
+++ b/dev-ruby/rspec-rails/rspec-rails-3.3.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-rails/rspec-rails-3.3.2.ebuild,v 1.1 2015/06/28 05:59:05 graaff Exp $
+
+EAPI=5
+
+USE_RUBY="ruby19 ruby20 ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="RSpec's official Ruby on Rails plugin"
+HOMEPAGE="http://rspec.info/"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+SUBVERSION="$(get_version_component_range 1-2)"
+
+ruby_add_rdepend ">=dev-ruby/activesupport-3.0:*
+	>=dev-ruby/actionpack-3.0:*
+	>=dev-ruby/railties-3.0:*
+	=dev-ruby/rspec-${SUBVERSION}*"
+
+# Depend on the package being already installed for tests, because
+# requiring ammeter will load it, and we need a consistent set of rspec
+# and rspec-rails for that to work.
+ruby_add_bdepend "test? (
+	=dev-ruby/mocha-0.10*
+	>=dev-ruby/capybara-2.0.0
+	>=dev-ruby/ammeter-1.1.2
+	~dev-ruby/rspec-rails-${PV}
+)"
+
+all_ruby_prepare() {
+	# Remove .rspec options to avoid dependency on newer rspec when
+	# bootstrapping.
+	rm -f .rspec || die
+
+	# Avoid bundler-specific specs.
+	rm -f spec/sanity_check_spec.rb || die
+
+	# Avoid broken controller generator specs for now.
+	rm -fr spec/generators/rspec || die
+}
diff --git a/dev-ruby/rspec-support/Manifest b/dev-ruby/rspec-support/Manifest
index 2cbc85e1690d..5d64fb82bff2 100644
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@@ -1,2 +1,3 @@
 DIST rspec-support-3.1.2-git.tgz 31345 SHA256 d45a866caf6e5e7483c08023378e0973257dde1ba542d62e1cd52e336824f38a SHA512 da97694a6e702af9ec50bbb637f0468f0beac1b59ab3429fffa68f11c2acffa20a31baed553550b4e84cbda4136aabd97de2a97dbe35ea908c91063954ddf957 WHIRLPOOL 3c9979d74c477a14ac5448dea9f94fb2a9be463eb7e4fa76d3bc0f40232a6d1935db154d6e9af6fc1b58b1625269394b2f489b584c23d3d110e8e53fc753f1be
 DIST rspec-support-3.2.1-git.tgz 38054 SHA256 5b4349b9139124d2dfc6900ddde20583503f2147b452b59afaf0a2ec858987a4 SHA512 2813bbd7c875aa3aa958e7ce0ac01f4ad19c581814369daee67d73130de0d0de136a78930ee2da38333892edd3e64bcdb67ac2f8ccd2fa468f4f8a99f96b1344 WHIRLPOOL 98e62fffe7c7f45769c1ec5751ad7b20884c3826183d773da5dc46f9c5652067472f00d1c24318ebd42ae23591c3d94c0e591777455e485b3826653a20c01867
+DIST rspec-support-3.3.0-git.tgz 45380 SHA256 cea58331f616e407c4ee25bb0b74bad26dbdc793fd341010d37749dea15e30a2 SHA512 88f0fdbc7609093c8f14bff220a03d0788847315e5ac73c025cd181d84a3ac120c294aca8ffff9a0c11c9f11e35019dc337f9e43fc2c33cabe4856d87e36fa1e WHIRLPOOL 6f355bb1dc71bbb7804fd3d4a4227042bbe0d166ef336e4121730abce52e1596b25b94ae38e72a6284ca2eac6d0eb6146a02f54d08792b1ff5a6320d40524a2a
diff --git a/dev-ruby/rspec-support/rspec-support-3.3.0.ebuild b/dev-ruby/rspec-support/rspec-support-3.3.0.ebuild
new file mode 100644
index 000000000000..805162ba21b2
--- /dev/null
+++ b/dev-ruby/rspec-support/rspec-support-3.3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec-support/rspec-support-3.3.0.ebuild,v 1.1 2015/06/28 05:58:40 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec-support"
+SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.3.0:3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Remove spec that, by following symlinks, tries to scan pretty much
+	# the whole filesystem.
+	rm spec/rspec/support/caller_filter_spec.rb || die
+}
diff --git a/dev-ruby/rspec/Manifest b/dev-ruby/rspec/Manifest
index 8d1c59dd097b..2e6a3d34446a 100644
--- a/dev-ruby/rspec/Manifest
+++ b/dev-ruby/rspec/Manifest
@@ -3,3 +3,4 @@ DIST rspec-2.14.1.gem 4608 SHA256 4f9fc6c58696faa22571ca80d710fd0e4f30eaeb700155
 DIST rspec-2.99.0.gem 5632 SHA256 432b31d528aac0dd192b3fa7c83f6cc22dec4a0385fb4020d293cc6777870393 SHA512 bcdf5e86938b102200144c49370e0a0691e39a8720048df2eab1a55f95a5bc5e4ced84c7da86d0ddc83ee4ce0f40602c2ae7ee10e55dccf8bb8b769ab048ebb8 WHIRLPOOL 7c71c569e3dd2a94f4564298c7af1069d29c0a1ca8b6045cd5b8ba0ae6833fa2e948b572d048397adc2aae90578e2cdf1f98e3fb0197697927538e925bef7b1c
 DIST rspec-3.1.0.gem 9728 SHA256 a8cfd7ac8416089e3fbf470402760b2d913904ea27d5b3b520b89ac668defee5 SHA512 d1f06f923f6be2a791cb9ae3149194ebb9af5bd5213b88a8ef303d4ede05d8b99dadb5c8d57d98d209e4e4b8cc0bab8f6d057b1d01faf48e1341573c28196bea WHIRLPOOL dfe4e0f304d3958861c730d42453b13bbbdab74658542464c9b56eebc13ab6de60c0e45871ae72eff351d9dbbc041bf9c2f3d64e60dd43b0f7d8447d6cf84c0c
 DIST rspec-3.2.0.gem 10240 SHA256 8e30e6401ab05fd1ae253067b262d7837b0b67a2211b5ede589c754f64007f52 SHA512 743c739b7716430c2b5b75aa57e6d3c17749e8100eca86873cb3c86e9f31a9e80959dd6876eb12d27da363968e7417acb36503ad4a208a3b905e47e0f3fe3a7c WHIRLPOOL fa606b40501b4ed8b183f4b1e48f4cd75308abf49176b5a1a30b3155299d3f83168880f3989ecee2a91c57b9486038b4e6a7e83c983154526cea8cbf97ad69e7
+DIST rspec-3.3.0.gem 10240 SHA256 99548f038d0b9e55f670e77edb0f1ebcaf127d456c64a1adff803d158efec5ae SHA512 cafc2bcfae261da8f990a8c6327db88f800d73c9fed2dbf4ca360930376906ae6621349ac9cc92b900e069647eb9d1dde1e41feb6ba25b84d30228ae038efbd4 WHIRLPOOL ecf1b141131b60c9b074ed09d794bfc797487c369aa3e9e632c6ca187760b43063fb9eb3d4b354e7516bc8cbbf4f44069afd365020befe1ecfd374c67ea11907
diff --git a/dev-ruby/rspec/rspec-3.3.0.ebuild b/dev-ruby/rspec/rspec-3.3.0.ebuild
new file mode 100644
index 000000000000..0ad7f7efee4b
--- /dev/null
+++ b/dev-ruby/rspec/rspec-3.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rspec/rspec-3.3.0.ebuild,v 1.1 2015/06/28 06:01:30 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
+HOMEPAGE="https://github.com/rspec/rspec"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+SUBVERSION="$(get_version_component_range 1-2)"
+
+ruby_add_rdepend "
+	=dev-ruby/rspec-core-${SUBVERSION}*
+	=dev-ruby/rspec-expectations-${SUBVERSION}*
+	=dev-ruby/rspec-mocks-${SUBVERSION}*"
diff --git a/dev-ruby/ruby-beautify/Manifest b/dev-ruby/ruby-beautify/Manifest
index 5be90d73bf8a..e97384698eb0 100644
--- a/dev-ruby/ruby-beautify/Manifest
+++ b/dev-ruby/ruby-beautify/Manifest
@@ -1,2 +1 @@
-DIST ruby-beautify-0.92.2.gem 15872 SHA256 8f547e6be9612d492ae44ddf937b0049ad520147b9b8dbe0384a312919c2157d SHA512 e654fd6595fcc0a191eb1b7d5b6aa0fee0093723e17da6657dd0418e809e1e6d5c38933b07c18b126dac89dabfc215eff6e8a7e94331941b73b24c63fe1756d8 WHIRLPOOL 01dde532574a19558708c6c53edb12487f609354f9c3e14ffebef03642ea193122f95118150fa3c24f4a15aafec79a95cb36b6766909339de5bc661ad95c21af
 DIST ruby-beautify-0.93.2.gem 9216 SHA256 6b2ca9d69495b66d35569a3fe895485063b9f506d0002b970ec88bc778ffd366 SHA512 ff2d97020d1a4c394e26387cd92b6e4b04066f539cd28ed2c3b122606a2e2aea18939373c1d23e229e4ae17bb670b8dbe109d9b45c86e3a5c59614babd212cac WHIRLPOOL ed2867b02001acbfb15465aaff737cddf79672cf4d1cefac8d5734b73aa50c4b3043796d19f887192f9c95383e80583435d9a818ee8b50f06673ee6f74815aaa
diff --git a/dev-ruby/ruby-beautify/ruby-beautify-0.92.2.ebuild b/dev-ruby/ruby-beautify/ruby-beautify-0.92.2.ebuild
deleted file mode 100644
index 13a97018bd8e..000000000000
--- a/dev-ruby/ruby-beautify/ruby-beautify-0.92.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-beautify/ruby-beautify-0.92.2.ebuild,v 1.1 2014/08/16 07:00:14 graaff Exp $
-
-EAPI=5
-USE_RUBY="ruby19 ruby20 ruby21"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a cli tool (and module) to beautify ruby code"
-HOMEPAGE="https://github.com/erniebrodeur/ruby-beautify"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid failing tests for now. We are adding this for
-	# dev-ruby/gherkin and they seem happy with it.
-	# https://github.com/erniebrodeur/ruby-beautify/issues/2
-	sed -e '/not change the indentation of multiline string/,/^$/ s:^:#:' \
-		-e '/not indent multineline comment/,/^$/ s:^:#:' \
-		-i spec/fixtures/ruby.yml || die
-}
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.1.4.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.1.4.ebuild
index 64704e8f5b60..7656b545c0f8 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.1.4.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.1.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/dev-ruby/ruby2ruby/ruby2ruby-2.1.4.ebuild,v 1.2 2015/06/16 05:00:05 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby2ruby/ruby2ruby-2.1.4.ebuild,v 1.4 2015/06/26 14:40:17 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://seattlerb.rubyforge.org/"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.6.6.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.6.6.ebuild
index 53098c7857a9..b0919d5b54bb 100644
--- a/dev-ruby/ruby_parser/ruby_parser-3.6.6.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.6.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-ruby/ruby_parser/ruby_parser-3.6.6.ebuild,v 1.2 2015/06/16 05:02:56 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby_parser/ruby_parser-3.6.6.ebuild,v 1.4 2015/06/26 14:40:13 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby_parser"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/sexp_processor-4.1:4
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 13fff0e7d6ec..c6d445896691 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -1,6 +1,4 @@
 DIST rubygems-2.2.2.tgz 414111 SHA256 572dd13baa1dfb9756db9fbfeb629be1634efddb7014c552845c0e9a5a643009 SHA512 574d72436356ae66834ee6991e4a886e37babc98ca5b270086f43b5a85f8fdb50365f5a2109e937163dad5a1b8a4d66f16d2308ed27438c99be036b3e56d3dd1 WHIRLPOOL 442efa9ed4bf4e39802f5c9307e0d4ae55372daf47e7a3d98d55a3d9e79afdb10f8e32e95ea0166d2fa264dc0c8d2bc01b8ec4de31fc022ef950b0cb8794a4bd
-DIST rubygems-2.2.4.tgz 416708 SHA256 31a9e25a7ce8c4d6547cdd31cb504af8f643bb26c865227a66113673853fa5cb SHA512 f7e345698f09cf6148fc7a3ccedcb4914a234f40baca8e03c9fb37b1209ae7aa0d48e8b20a6868289759df5b5c05b79ff308dd8f1b0de41c916b8550ba7f2978 WHIRLPOOL b561651ed96ac9c525104d6a785f88e19dda475cb38b04687ecdf64f1683659750bc84b85f87bbddd0436710bd0d985641f6417bb249dd9be29317c8fff1ca05
 DIST rubygems-2.2.5.tgz 416772 SHA256 0f015d63ee3f48be2cc440332d992a33f6df113ced25b7a0007372d304bfeaa4 SHA512 eac6d7c4801d7bf65ac8e244ff88677929e491db8c5054a31d936eaf1e1fabfc8c4b560040c01c7d9707758cfbad9a8063144bb37b494dd1b6f66a0222871e03 WHIRLPOOL 6e02359ce84352f39b13c3f59d9fd82788a5a2ae88d069df05642d5349cb33c06c3477de56c937a44742fb6aa6cfdb7b32dbadac131fb12e6387f983564879c6
 DIST rubygems-2.4.6.tgz 447588 SHA256 76d3f3b10aa824d23a511f098ab777c6473b98ffa733f7be4222408897b68db9 SHA512 2cf5447e0de8e8f85916e91774eba1f2113397d3ed7147671b74443696574ba0478d8f2aec789d024eabcd5afc1c4910dbe71f389b30045fa50bde14d2bb1cb1 WHIRLPOOL e901f4354c706666b8f85cd0d345c8ad04eecb88914927e9b213bd7a83fd9be42c3d1082da87cafce0cc05deafa70436250a2fee92b62f91e6e113fbfa66c1b0
-DIST rubygems-2.4.7.tgz 447941 SHA256 62fabf8b1a3009cf65f0fc9c2bad68754aa229780d7139232c4ca9f4708ad6ec SHA512 28de22094c2815a70484f4362b5fc77ee225362e9736f88b25dceea724c567bc2d4135dcb809f298c9a2f49395995486e6131bde7e502882e27f87f482bce110 WHIRLPOOL a1f008cf54d176199a49134227bd324a0ccec9337f0e03b49a44616a7704a42753ebf34b74bba20679980398c73a7b6179d9dd575185b8d2dc13f117cf1db823
 DIST rubygems-2.4.8.tgz 447712 SHA256 5a4335fef5904ceb76d912a9d4a2464fbbb172df3b2abcb0c67003e77764845e SHA512 1cc2e9e19d665268f475ce90547377d41a4ea5ce9a9afab4979de0247a0dd82b04529c087c899d9ced5564fa9051e1d2fe23ddb764ba411915bab2ce344ac419 WHIRLPOOL e9fa65b3ff24a05082fd6ded221706c45e8d7c6677ccc31e6971991320800d47fef99651fb338c797e20ab4ab7775c7192e09f4575fc815640c4f2a8d5ea273b
diff --git a/dev-ruby/rubygems/rubygems-2.2.4.ebuild b/dev-ruby/rubygems/rubygems-2.2.5-r1.ebuild
similarity index 98%
rename from dev-ruby/rubygems/rubygems-2.2.4.ebuild
rename to dev-ruby/rubygems/rubygems-2.2.5-r1.ebuild
index 114fc3eac73d..fd440d19ecf8 100644
--- a/dev-ruby/rubygems/rubygems-2.2.4.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.2.5-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/rubygems/rubygems-2.2.4.ebuild,v 1.2 2015/06/07 14:32:37 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.2.5-r1.ebuild,v 1.1 2015/06/28 08:10:54 graaff Exp $
 
 EAPI=5
 
diff --git a/dev-ruby/rubygems/rubygems-2.2.5.ebuild b/dev-ruby/rubygems/rubygems-2.2.5.ebuild
index 00098ff046a8..1a7782175f84 100644
--- a/dev-ruby/rubygems/rubygems-2.2.5.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.2.5.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-ruby/rubygems/rubygems-2.2.5.ebuild,v 1.1 2015/06/11 05:37:16 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.2.5.ebuild,v 1.2 2015/06/28 08:10:54 graaff Exp $
 
 EAPI=5
 
-USE_RUBY="ruby19 ruby20 ruby21"
+USE_RUBY="ruby19 ruby20"
 
 inherit ruby-ng prefix
 
diff --git a/dev-ruby/rubygems/rubygems-2.4.7.ebuild b/dev-ruby/rubygems/rubygems-2.4.7.ebuild
deleted file mode 100644
index 7c3399e36e67..000000000000
--- a/dev-ruby/rubygems/rubygems-2.4.7.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.4.7.ebuild,v 1.1 2015/05/19 05:37:22 graaff Exp $
-
-EAPI=5
-
-USE_RUBY="ruby19 ruby20 ruby21 ruby22"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="http://rubyforge.org/projects/rubygems/"
-LICENSE="|| ( Ruby MIT )"
-
-SRC_URI="http://production.cf.rubygems.org/rubygems/${P}.tgz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="server test"
-
-PDEPEND="server? ( >=dev-ruby/builder-2.1 )"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/minitest-4:0
-		dev-ruby/rdoc
-	)"
-
-all_ruby_prepare() {
-
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults.rb" lib/rubygems/defaults/operating_system.rb || die
-
-	eprefixify lib/rubygems/defaults/operating_system.rb
-
-	# Disable broken tests when changing default values:
-	sed -i -e '/test_check_executable_overwrite_default_bin_dir/,/^  end/ s:^:#:' test/rubygems/test_gem_installer.rb || die
-	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-
-	# Remove a test that fails when yard is installed.
-	sed -i -e '/test_self_attribute_names/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
-
-	# Skip tests for default gems that all fail
-	sed -i -e '/test_default_gems_use_full_paths/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-	sed -i -e '/test_execute_ignore_default_gem_verbose/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
-	sed -i -e '/test_execute_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
-	sed -i -e '/test_execute_default_details/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
-	sed -i -e '/test_execute_all/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
-	sed -i -e '/test_load_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
-	sed -i -e '/test_uninstall_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
-	sed -i -e '/test_alien_default/,/^  end/ s:^:#:' test/rubygems/test_gem_validator.rb || die
-
-	# Avoid tests playing tricks with ruby engine that don't seem to
-	# work for us.
-	rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
-
-	# Avoid test requiring network access
-	sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
-}
-
-each_ruby_compile() {
-	# Not really a build but...
-	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
-}
-
-each_ruby_test() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	#unset RUBYOPT
-
-	if [[ "${EUID}" -ne "0" ]]; then
-		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} -I.:lib:test \
-			-e 'Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
-	else
-		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
-		eerror "Testsuite will not be run."
-	fi
-}
-
-each_ruby_install() {
-	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
-	unset RUBYOPT
-	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
-	pushd lib &>/dev/null
-	doruby -r *
-	popd &>/dev/null
-
-	local sld=$(ruby_rbconfig_value 'sitelibdir')
-	insinto "${sld#${EPREFIX}}"  # bug #320813
-	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
-
-	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
-}
-
-all_ruby_install() {
-	dodoc History.txt README.rdoc
-
-	if use server; then
-		newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
-		newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
-		eselect ruby set $(eselect --brief --no-color ruby show | head -n1)
-	fi
-
-	ewarn
-	ewarn "To switch between available Ruby profiles, execute as root:"
-	ewarn "\teselect ruby set ruby(20|21|...)"
-	ewarn
-}
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.4.4.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.4.4.ebuild
index a064159f1a2c..9fa55369835d 100644
--- a/dev-ruby/sexp_processor/sexp_processor-4.4.4.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.4.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/dev-ruby/sexp_processor/sexp_processor-4.4.4.ebuild,v 1.4 2015/06/16 05:09:12 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/sexp_processor/sexp_processor-4.4.4.ebuild,v 1.6 2015/06/26 14:40:09 ago Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.zenspider.com/ZSS/Products/ParseTree/"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/term-ansicolor/Manifest b/dev-ruby/term-ansicolor/Manifest
index 298687bfc28c..071243ea68b1 100644
--- a/dev-ruby/term-ansicolor/Manifest
+++ b/dev-ruby/term-ansicolor/Manifest
@@ -1,3 +1,3 @@
 DIST term-ansicolor-1.2.2.gem 889856 SHA256 b9534713ba4c2a48f2291fadf9ce2edae9f2dc96157ee812fe8fe16a70c081ac SHA512 c1ad873f47d2d0d0677d9c9229531cc341ab1650acf5b9a7704a4739796c9b7dfa6357ce60708b3e0efeb342837d9f23acc178005c4eae6b077a27f20a69eb15 WHIRLPOOL 5842abfa00a8a79f11fe6ebcee154fb2730c75786e45414ca382db946ce3d65652d6c5c8164988231f982100fc02e22612206eeb7cfe1e3e2985343316e12e0c
 DIST term-ansicolor-1.3.0.gem 890368 SHA256 8b5caf6839a0c1bbf7a55a9d2fbd3c172f623fa05c427f9b3ea5d75bdfe14fa8 SHA512 ee039f4b5ecf8646b5c12c8d50f01c85b0dff0ab61f37199213407e29c4b4026cf44e5b12043a74a26a597a0a2572a282adcea21f5b8d2c5bb822fca4dfbdc1e WHIRLPOOL 1cdd9cfe7726415a890dc179f3c14b26fd61ccc81621a17c57e62821cc71daf783cdc93bf40a33da9705eb80615ec7dfbe67c30d61d6bcd492b9b83478f632c5
-DIST term-ansicolor-1.3.1.gem 890880 SHA256 3881dfecb33903585797a989ef6d0a341f73541f2309956244fea3cd84d4c503 SHA512 097af6f138e45d638e03e606a49ca4a5dd213ce889c2236eafb6cba461508b62a4dbf9e9f8911242bfad0550ec4789bfeaa5cf7b29d638eedb328a5902fa7de8 WHIRLPOOL dacf47006f233498b53f7fc7d93624f138676a7f31f8ed9cad7ce170123b9dcd87fea3bb58e1d8b252e260bbd182dc00576eb123aebf7ca26cf42e28eaf7bc0e
+DIST term-ansicolor-1.3.2.gem 890368 SHA256 da7ba80ae2dad077736a48dac18ae9d859990e9ed6b952a276e79659a55fab79 SHA512 97617f3477f08e5ebbe70b5e8531031346d3639343c6a73fd802eb45777fbbba22649980f8968e2bba0394e470d5bb03bcd5b9374c36200c29a256016ed4cd29 WHIRLPOOL b8b1b6cb3d8f7d65665d3416da846412f3d2f2b609b52f2744492635b300f9c341d2f5528870ff70a3ec6401edb165741cca5916d417e15d8e1f407480f3ce46
diff --git a/dev-ruby/term-ansicolor/term-ansicolor-1.3.1.ebuild b/dev-ruby/term-ansicolor/term-ansicolor-1.3.2.ebuild
similarity index 94%
rename from dev-ruby/term-ansicolor/term-ansicolor-1.3.1.ebuild
rename to dev-ruby/term-ansicolor/term-ansicolor-1.3.2.ebuild
index 830abd8e54c5..89687f930b1b 100644
--- a/dev-ruby/term-ansicolor/term-ansicolor-1.3.1.ebuild
+++ b/dev-ruby/term-ansicolor/term-ansicolor-1.3.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-ruby/term-ansicolor/term-ansicolor-1.3.1.ebuild,v 1.1 2015/06/19 06:39:50 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/term-ansicolor/term-ansicolor-1.3.2.ebuild,v 1.1 2015/06/27 21:27:59 mrueg Exp $
 
 EAPI=5
 USE_RUBY="ruby20 ruby21 ruby22"
diff --git a/dev-ruby/test-unit/test-unit-3.1.2.ebuild b/dev-ruby/test-unit/test-unit-3.1.2.ebuild
index a664dbe657ee..c55e0d62d3f1 100644
--- a/dev-ruby/test-unit/test-unit-3.1.2.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.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/dev-ruby/test-unit/test-unit-3.1.2.ebuild,v 1.1 2015/06/10 09:18:59 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/test-unit/test-unit-3.1.2.ebuild,v 1.2 2015/06/28 07:20:31 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20 ruby21 ruby22"
@@ -15,7 +15,7 @@ inherit ruby-fakegem
 # yard for the other ruby implementations. Without this assumption
 # bootstrapping ruby22 won't be possible due to the yard dependency
 # tree.
-USE_RUBY="${USE_RUBY/ruby22/}" ruby_add_bdepend "doc? ( dev-ruby/yard )"
+#USE_RUBY="${USE_RUBY/ruby22/}" ruby_add_bdepend "doc? ( dev-ruby/yard )"
 
 DESCRIPTION="An xUnit family unit testing framework for Ruby"
 HOMEPAGE="https://rubygems.org/gems/test-unit"
diff --git a/dev-ruby/vlad/Manifest b/dev-ruby/vlad/Manifest
index 416dec9c47e6..26a6a851b379 100644
--- a/dev-ruby/vlad/Manifest
+++ b/dev-ruby/vlad/Manifest
@@ -1,2 +1,3 @@
 DIST vlad-2.6.3.gem 29184 SHA256 61d560f74c08844648fee9820c6d83da32c4c74e7ee541d15628151c3658889e SHA512 13246b98ee7238f1a5ff8ec9df3a1ecb3c137a1ab2e07af6f8a01c61ebc9798a6a1dd0f8080d31dcfff7d81268848868a6960939dd02713e585aeb732be95a52 WHIRLPOOL 525fb6b885c8f6dd20ec0f369ff6d8c973971bd65b36bb9ff99823cd7dd537f861fb4bf9b6540b07c23802b3fa1c30ceeef7789dcd7ffdd2540afe9b1d0331d5
 DIST vlad-2.6.4.gem 29184 SHA256 ad1c2cd8c0c9584aaa4061baaebfeba2df619e8c7ccbe25ff1e22b4696ea045d SHA512 e9d233c3caf01a7c77317e1bf64fb3832939fe5b85734874215160d9dd9b89967eeb80edc9ffdc4af47bc3f9c1b32eef77c29d99ad0535835c1a35cc55d5538e WHIRLPOOL ec730a456547e9c1e1f56c12fd5fa48f50eac04531f737ecb8c63c9fd7383cd7ee0748ffc34601bf6ed33cfe772dc61662aede26e7d097ba2d86025463e05348
+DIST vlad-2.6.5.gem 29184 SHA256 2447cce7b2db8695fcb9eb4fef5ed22932f217132e65ef95c3d66c5a07976044 SHA512 d1cf81372b973ad383cba7ad42512e9f734efc2034ae40ba6ef68277693c01568ee68613b97c8ead81793c748b848d5201f3b45cc00c16e3b460a95e42702f4f WHIRLPOOL 50942dd5fb0cff59da56613b146edc2bc565b5e755bfea8cc6dc0df9f3e9e73590ddc3063068df134cbfd1600e43cf0cd6b6a61dd41ebc5c2993c79910a75fcc
diff --git a/dev-ruby/vlad/vlad-2.6.5.ebuild b/dev-ruby/vlad/vlad-2.6.5.ebuild
new file mode 100644
index 000000000000..e8d3ad618d33
--- /dev/null
+++ b/dev-ruby/vlad/vlad-2.6.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/vlad/vlad-2.6.5.ebuild,v 1.1 2015/06/27 21:24:58 mrueg Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_TASK_DOC="docs"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="considerations.txt History.txt README.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pragmatic application deployment automation, without mercy"
+HOMEPAGE="http://rubyhitsquad.com/Vlad_the_Deployer.html"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_bdepend ">=dev-ruby/hoe-3.13
+	test? ( >=dev-ruby/minitest-5.7 )"
+ruby_add_rdepend ">=dev-ruby/rake-remote_task-2.3"
+
+all_ruby_prepare() {
+	# Keep Isolate from managing the dependencies.
+	sed -i -e '/isolate/ s:^:#:' -e '/rubyforge/ s:^:#:' Rakefile || die
+}
diff --git a/dev-scheme/elk/Manifest b/dev-scheme/elk/Manifest
index f357ae43df86..7ba640f33fc6 100644
--- a/dev-scheme/elk/Manifest
+++ b/dev-scheme/elk/Manifest
@@ -1,2 +1 @@
-DIST elk-3.99.7.tar.bz2 646698 SHA256 a72b66b219313af23f5923a476c8b332e0124c953fd172bb62d5f9554d3cbc4c
 DIST elk-3.99.8.tar.bz2 701206 SHA256 a148320c8d2c2b1277ad3572a9d8a9eb4db0473643caa35f098e28c9da14dc66 SHA512 dd966bf6063b4e04c0947e56381cc9456ea81cf4ec66d04e80cb79485d39414f0b713520278a62fa4630068f245f33b28b08b5fd4a7defd0bcb20bf2eba4ed49 WHIRLPOOL 3b8f6a26277ebe5c2e4ad2420b7e842b125bde1406120e89db5a25c770e70dd015a300289432e15e541d588fef451233c72ce7236a93cdf653430933c09a18bc
diff --git a/dev-scheme/elk/elk-3.99.7.ebuild b/dev-scheme/elk/elk-3.99.7.ebuild
deleted file mode 100644
index d1a339d68908..000000000000
--- a/dev-scheme/elk/elk-3.99.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/elk/elk-3.99.7.ebuild,v 1.2 2010/01/31 19:48:01 tove Exp $
-
-DESCRIPTION="Scheme implementation designed to be embeddable extension to C/C++ applications"
-HOMEPAGE="http://sam.zoy.org/elk"
-SRC_URI="http://sam.zoy.org/elk/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-
-src_compile() {
-	econf
-
-	# parallel build is broken
-	emake -j1 || die "Make failed!"
-}
-
-# tests are run automatically during make and fail with default src_test
-src_test() {
-	echo "Tests already run during compile"
-}
-
-src_install() {
-	# parallel install is broken
-	emake -j1 DESTDIR="${D}" install || die "Install failed"
-}
diff --git a/dev-scheme/guile-lib/Manifest b/dev-scheme/guile-lib/Manifest
index 1c11f09c5d74..53828abdb191 100644
--- a/dev-scheme/guile-lib/Manifest
+++ b/dev-scheme/guile-lib/Manifest
@@ -1,3 +1 @@
-DIST guile-lib-0.1.3.tar.gz 470740 SHA256 4001919460e4c00c0924007fd38d779fd6044c34d2b9e90fbf18d0a6acb7d5ee
-DIST guile-lib-0.1.6.tar.gz 508682 SHA256 827744c7954078f1f37e0bf70252ec70b4d60c1482a3542a49bd09723cf65d12 SHA512 5ccde61ae3e3fb5289d0cc03c8230adc6b9a4afb8bdc48af04270461cc9a24327bcd9f3a173ff8b0349ff3237bafe3942ac7e3416ca21731bd45f5db3dfd4ea8 WHIRLPOOL 108520a386fc63a913b6d6849985c91e0357f2147d263532d19e19551a749d9e053b64faab44902e6ff22a40e9a42a43877ef0c4179dcf890354cd28843bc259
 DIST guile-lib-0.1.9.tar.gz 499394 SHA256 563dd0bfa8acc359e5d72b2618b98f1e1c2615f44bf164947bae66d053174c8f SHA512 53a00064783c6cdc450f3130808ca57696fdcd1aa25172b448f6d18861425e1dfa9a004df0405df0629950e80c43b4aebbef28be1e75a37f0d9cd4608ecc309e WHIRLPOOL 0b958a9acede7fc5e7475ee95ca7fc208ea104af62b93f8e77c14fe0882fd0311add7b71181c293ea9ad84e97d52c213eb988da164616133b276d2238aa2de2f
diff --git a/dev-scheme/guile-lib/guile-lib-0.1.3.ebuild b/dev-scheme/guile-lib/guile-lib-0.1.3.ebuild
deleted file mode 100644
index e572979d1784..000000000000
--- a/dev-scheme/guile-lib/guile-lib-0.1.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-lib/guile-lib-0.1.3.ebuild,v 1.13 2010/09/23 23:51:17 chiiph Exp $
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="An accumulation place for pure-scheme Guile modules"
-HOMEPAGE="http://www.nongnu.org/guile-lib/"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ppc sparc x86"
-IUSE=""
-
-RDEPEND="dev-scheme/guile[regex,deprecated]"
-DEPEND="${RDEPEND} !<dev-libs/g-wrap-1.9.8"
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "install failed"
-}
diff --git a/dev-scheme/guile-lib/guile-lib-0.1.6.ebuild b/dev-scheme/guile-lib/guile-lib-0.1.6.ebuild
deleted file mode 100644
index 84710317fac8..000000000000
--- a/dev-scheme/guile-lib/guile-lib-0.1.6.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/guile-lib/guile-lib-0.1.6.ebuild,v 1.10 2010/09/23 23:51:17 chiiph Exp $
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="An accumulation place for pure-scheme Guile modules"
-HOMEPAGE="http://www.nongnu.org/guile-lib/"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="dev-scheme/guile[regex,deprecated]"
-DEPEND="${RDEPEND} !<dev-libs/g-wrap-1.9.8"
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "install failed"
-}
diff --git a/dev-scheme/kawa/Manifest b/dev-scheme/kawa/Manifest
index 50194dee4ff2..1322589956a2 100644
--- a/dev-scheme/kawa/Manifest
+++ b/dev-scheme/kawa/Manifest
@@ -2,5 +2,3 @@ DIST XQTS_1_0_2.zip 19879467 SHA256 923361362d70a20818c6442eb52a6401fe9d2e53e4f5
 DIST XQTS_1_0_3.zip 30956043 SHA256 1a6c9dd8761f021e78105efd4f46d5d35bb8b73b18e14bfde0512661e6be78ec SHA512 e00efd3dbf0b1cf530795073f7548cf4ab4f3c55921f76af7c000e61e1d7293cd11f41d617b3ce5343df5e9c5b6de4ee3819a6db2b15df9441a19489ae46e1dd WHIRLPOOL 57ac5b2d5a38446d89df7bd7d06dbe09a592b6243ceb415fac4d2d0bf154a8cf51307194feab7eef14643bdd8f24e87f307b2cb521f5f81ef412814bf9fddc8b
 DIST kawa-1.10.tar.gz 2238130 SHA256 f697f5784b55b1945f0644954459f88a0eb9511bb60d695b1a9767b58eb7492e SHA512 4ab27331f7be6d6107272e75508179ed7d14c475e1fffaceeb7a16600e3ba4e54fc63506788ed89fca1f2d390477d2e3e685f29b015a28214fcb4f62016c943d WHIRLPOOL 2dc4c85ae4d8496b0425d6faf9c6077fe66906a107d0780b60d19fc91992b0a06f066857c4aa45fb81e29495ec4f9c7d9bac9d6f9a210874d2ffaf79dbf851eb
 DIST kawa-1.14.tar.gz 2691484 SHA256 2201cf3f4c57f49f15cf929d8634855cb8ef4ffe79158cecd66ebd5bd9b4b909 SHA512 e0a0eafd4ed0ce7d254f295db8e920b82cfef6f4f71c440db655d73761a2f99ab743def1daa54241998497db8f29269c7d98f7e3bf819a36d7f7151d3ba2913e WHIRLPOOL 6f7e32e38ecea68e4d7faffc2cb1df16d33b384010391d23507397714891ad1588a35aa7d0b4c1079322acc3250f25459c94ddb68f90a14f04a552f847542d6a
-DIST kawa-1.9.1.tar.gz 1973504 SHA256 590da119e1a130c059cdb08dcf0a17a2d27f14020bd51b99a8318554b57a77d9
-DIST kawa-1.9.90.tar.gz 2079745 SHA256 11152de647e93ea966883bc59f761033520ce1e3e4c9e3cc9f7b5ba1d0d5f4b7
diff --git a/dev-scheme/kawa/kawa-1.9.1.ebuild b/dev-scheme/kawa/kawa-1.9.1.ebuild
deleted file mode 100644
index 314e1b23e2a9..000000000000
--- a/dev-scheme/kawa/kawa-1.9.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/kawa/kawa-1.9.1.ebuild,v 1.2 2008/03/30 20:28:09 maekke Exp $
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="Kawa, the Java-based Scheme system"
-HOMEPAGE="http://www.gnu.org/software/kawa/"
-SRC_URI="mirror://gnu/kawa/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jre-1.4"
-
-src_compile() {
-	#copy of the default so that java-pkg-2 doesn't get used
-	econf
-	emake || die "emake failed"
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-	rm -rv "${D}"/usr/share/java/ || die
-	java-pkg_newjar kawa-${PV}.jar
-	dodoc TODO README NEWS || die
-	doinfo doc/kawa.info* || die
-	java-pkg_dolauncher ${PN} --main kawa.repl
-}
diff --git a/dev-scheme/kawa/kawa-1.9.90-r1.ebuild b/dev-scheme/kawa/kawa-1.9.90-r1.ebuild
deleted file mode 100644
index 532aa0db5f6d..000000000000
--- a/dev-scheme/kawa/kawa-1.9.90-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/kawa/kawa-1.9.90-r1.ebuild,v 1.1 2010/06/28 23:30:54 chiiph Exp $
-
-EAPI="3"
-
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2
-
-DESCRIPTION="Kawa, the Java-based Scheme system & Language Framework"
-HOMEPAGE="http://www.gnu.org/software/kawa/"
-XQTS_Ver="1_0_2"
-SRC_URI="mirror://gnu/kawa/${P}.tar.gz
-		 xqtests? ( http://www.w3.org/XML/Query/test-suite/XQTS_${XQTS_Ver}.zip )"
-
-LICENSE="MIT public-domain
-		 jemacs? ( GPL-2 )
-		 krl? ( GPL-2 )"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="+awt echo2 +frontend jemacs krl +sax servlets +swing swt +xml xqtests"
-
-COMMON_DEPEND="( >=virtual/jdk-1.5 )
-			   frontend? ( sys-libs/readline:0 )
-			   sax? ( dev-java/sax:0 )
-			   echo2? ( dev-java/echo2 )
-			   swt? ( dev-java/swt:3.5 )
-			   servlets? ( dev-java/servletapi:2.4 )"
-DEPEND="${COMMON_DEPEND}
-		xqtests? ( app-arch/unzip:0 )"
-RDEPEND="${COMMON_DEPEND}"
-
-xtestsuite="XQTS_${XQTS_Ver}"
-
-src_unpack () {
-	unpack kawa-${PV}.tar.gz || die
-	if use xqtests; then
-		mkdir "${WORKDIR}/${xtestsuite}" || die
-		cd "${WORKDIR}/${xtestsuite}" || die
-		unpack ${xtestsuite}.zip || die
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}.patch
-}
-
-src_configure() {
-	# speeds up one-shot ebuilds.
-	myconf="--disable-dependency-tracking"
-	if use jemacs && ! use swing; then
-		echo
-		einfo "Although the swing USE flag is disabled you chose to enable jemacs,"
-		einfo "so swing is enabled anyway."
-		echo
-		myconf="${myconf} --with-swing"
-	else
-		myconf="${myconf} $(use_with swing)"
-	fi
-	if use xqtests; then
-		myconf="${myconf} $(use_with xqtests XQTS=${WORKDIR}/${xtestsuite})"
-	fi
-	if use servlets; then
-		myconf="${myconf} --with-servlet=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)"
-	fi
-	if use swt; then
-		myconf="${myconf} --with-swt=$(java-pkg_getjar swt-3.5 swt.jar)"
-	fi
-
-	econf ${myconf} $(use_enable frontend kawa-frontend) \
-		  $(use_enable xml) \
-		  $(use_enable krl brl) \
-		  $(use_enable echo2) \
-		  $(use_enable jemacs) \
-		  $(use_with awt) \
-		  $(use_with sax sax2) \
-		  --with-java-source=$(java-pkg_get-source) || die "econf failed."
-}
-
-src_compile() {
-	emake -j1 || die "emake failed."
-}
-
-src_install () {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-	rm -rv "${D}"/usr/share/java/ || die "rm -rv failed"
-
-	java-pkg_newjar kawa-${PV}.jar || die
-
-	java-pkg_dolauncher "kawa" --main kawa.repl || die "dolauncher failed"
-	java-pkg_dolauncher "qexo" --main kawa.repl --pkg_args \
-		"--xquery" || die "dolauncher qexo failed"
-	if use servlets; then
-		java-pkg_dolauncher "kawa-cgi-servlet" --main \
-			gnu.kawa.servlet.CGIServletWrapper || die
-	fi
-	if use jemacs; then
-		java-pkg_dolauncher "jemacs" --main \
-			gnu.jemacs.lang.ELisp || die
-	fi
-
-	use source && java-pkg_dosrc kawa/* gnu/*
-
-	dodoc ChangeLog TODO README NEWS || die
-	doinfo doc/kawa.info* || die
-	cp doc/kawa.man doc/kawa.2 || die
-	cp doc/qexo.man doc/qexo.2 || die
-	doman doc/*.2 || die
-}
diff --git a/dev-scheme/scmxlate/Manifest b/dev-scheme/scmxlate/Manifest
index eadc09c8eac1..a52b388552d9 100644
--- a/dev-scheme/scmxlate/Manifest
+++ b/dev-scheme/scmxlate/Manifest
@@ -1,2 +1 @@
-DIST scmxlate-20060613.tar.gz 33920 SHA256 4ffa5b1f941546a400422dba49eb08c337829a9c4809c06e5670ad1570fd5c1d
 DIST scmxlate-20090410.tar.bz2 30016 SHA256 78fd2155dab925f1b47e36a57c55e6a322397737063aed1945b2da9325ae7cf6 SHA512 c6148a1c928ff326c5ac5442a0843a334645d76bb17a48d32018807a2dfa2a4147acfaf43866996d4b06fbe0e6723280da7e66576a3c7c18d70f8e75c73954af WHIRLPOOL 7a95f6f3698900ad87a0ba0a4aff3c5575bb2b7de1d52f4d26eb4db89ef1813095a12bf118df2f0b61d27077d73ec60efd120af5ff89e8ba339d57c5facb3759
diff --git a/dev-scheme/scmxlate/scmxlate-20060613.ebuild b/dev-scheme/scmxlate/scmxlate-20060613.ebuild
deleted file mode 100644
index ffeb48e04ac6..000000000000
--- a/dev-scheme/scmxlate/scmxlate-20060613.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scmxlate/scmxlate-20060613.ebuild,v 1.4 2014/08/10 21:25:48 slyfox Exp $
-
-DESCRIPTION="Scmxlate is a configuration tool for software packages written in Scheme"
-HOMEPAGE="http://www.ccs.neu.edu/home/dorai/scmxlate/scmxlate.html"
-#http://www.ccs.neu.edu/home/dorai/scmxlate/scmxlate.tar.gz
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="freedist" # license doesn't grant the right for modifications
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_install() {
-	insinto /usr/share/
-	doins -r *
-}
diff --git a/dev-scheme/sigscheme/Manifest b/dev-scheme/sigscheme/Manifest
index 37b66e95e8e9..7da9e7308df0 100644
--- a/dev-scheme/sigscheme/Manifest
+++ b/dev-scheme/sigscheme/Manifest
@@ -1,2 +1 @@
-DIST sigscheme-0.8.3.tar.bz2 1174309 SHA256 46bf80b53ffb0b64b563093d3190fbece3cc81da5015e5d8a837120de76b453a
 DIST sigscheme-0.8.5.tar.bz2 1117490 SHA256 046b00f4793ea1d1ad22b73af72c60f42ac83369d526b0a8b531509e67cd6bbe
diff --git a/dev-scheme/sigscheme/sigscheme-0.8.3.ebuild b/dev-scheme/sigscheme/sigscheme-0.8.3.ebuild
deleted file mode 100644
index a7b8237ada60..000000000000
--- a/dev-scheme/sigscheme/sigscheme-0.8.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/sigscheme/sigscheme-0.8.3.ebuild,v 1.3 2014/08/10 21:25:55 slyfox Exp $
-
-EAPI="3"
-
-DESCRIPTION="SigScheme is an R5RS Scheme interpreter for embedded use"
-HOMEPAGE="http://code.google.com/p/sigscheme/"
-SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_configure() {
-	econf --enable-hygienic-macro
-}
diff --git a/dev-scheme/stklos/Manifest b/dev-scheme/stklos/Manifest
index 93f5c8477c2c..4d8d907ad6c1 100644
--- a/dev-scheme/stklos/Manifest
+++ b/dev-scheme/stklos/Manifest
@@ -1,2 +1 @@
-DIST stklos-1.01.tar.gz 5865061 RMD160 a799a93ad76eede09aa66ee7520c65e344f7adb1 SHA1 bc2b6e7ea2bed278247cc155eae5d13e3ed7a0a6 SHA256 4917eb6151376959ceff1bfb7e9ce9e8df5d4634898f0633d16780e347aad18a
-DIST stklos-1.10.tar.gz 6097807 RMD160 517cad0a8cf99416887788f2454b55fc70f56f90 SHA1 113551b6bee26fbe5c835ef0db292b9276cccaa0 SHA256 215e6e6ffcf7751be5f0c114f83286f99e556e089ca1b0ee66f54dd1be080de4
+DIST stklos-1.10.tar.gz 6097807 SHA256 215e6e6ffcf7751be5f0c114f83286f99e556e089ca1b0ee66f54dd1be080de4
diff --git a/dev-scheme/stklos/stklos-1.01.ebuild b/dev-scheme/stklos/stklos-1.01.ebuild
deleted file mode 100644
index 06084f88e267..000000000000
--- a/dev-scheme/stklos/stklos-1.01.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/stklos/stklos-1.01.ebuild,v 1.3 2012/06/21 06:29:22 hkbst Exp $
-
-EAPI="3"
-
-inherit eutils
-
-DESCRIPTION="fast and light Scheme implementation"
-HOMEPAGE="http://www.stklos.net"
-SRC_URI="http://www.stklos.net/download/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="threads"
-DEPEND="dev-libs/gmp dev-libs/libpcre virtual/libffi dev-libs/boehm-gc[threads?]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# kill bundled libs
-	rm -rf "${S}"/{ffi,gc,gmp,pcre}
-}
-
-src_configure() {
-	econf --enable-threads=$(if use threads; then echo pthreads; else echo none; fi) \
-		--without-gmp-light --without-provided-gc \
-		--without-provided-regexp --without-provided-ffi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	dodoc AUTHORS ChangeLog NEWS PACKAGES-USED PORTING-NOTES README SUPPORTED-SRFIS \
-		|| die "dodocs failed"
-}
diff --git a/dev-scheme/tinyscheme/Manifest b/dev-scheme/tinyscheme/Manifest
index 4c34cd23d9c1..de19d83e7be0 100644
--- a/dev-scheme/tinyscheme/Manifest
+++ b/dev-scheme/tinyscheme/Manifest
@@ -1,4 +1 @@
-DIST tinyscheme-1.40.tar.gz 60160 SHA256 c594c84633b1dcfe832e0416cbc9f889b6bae352845e14503883119a941a12fc
 DIST tinyscheme-1.41.tar.gz 61761 SHA256 eac0103494c755192b9e8f10454d9f98f2bbd4d352e046f7b253439a3f991999 SHA512 a9c1c9cd7a11bf31e0f8ac813ebd6e731cb56b9526fd14d343d7f8c479a8e1b561b744b3f522512adc023cacd1acbf52aa18bf5d8db68f767971660305b79b0f WHIRLPOOL 4df1f6f80a03c1dae73cd0e39fead9d454c41be536c4a9ec63da80ab31e5712bae0f8a2e8a58154edcc4d595129a11399f65e59fe9f0524b7669912ce16825cf
-DIST tinyscheme1.38.zip 58182 SHA256 7d716794b9a20624ebb80a2e6b6a288301fc673d47ce6ae4d845aa40d9305803
-DIST tinyscheme1.39.zip 58751 SHA256 5b53bcacd5f48031c57567a8c76dc20f56db4a8a98ee9d4859556dfd6203ffbd
diff --git a/dev-scheme/tinyscheme/tinyscheme-1.38-r1.ebuild b/dev-scheme/tinyscheme/tinyscheme-1.38-r1.ebuild
deleted file mode 100644
index 7371257643dc..000000000000
--- a/dev-scheme/tinyscheme/tinyscheme-1.38-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2000-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/tinyscheme/tinyscheme-1.38-r1.ebuild,v 1.3 2008/03/13 20:20:32 hkbst Exp $
-
-MY_P=${PN}${PV}
-DESCRIPTION="Lightweight scheme interpreter"
-HOMEPAGE="http://tinyscheme.sourceforge.net"
-SRC_URI="http://tinyscheme.sourceforge.net/${MY_P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}"
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-	sed 's/PLATFORM_FEATURES = -DUSE_STRLWR=0/#PLATFORM_FEATURES = -DUSE_STRLWR=0/' -i makefile
-	sed 's/CC = gcc -fpic/CC = gcc -fpic ${CFLAGS}/' -i makefile
-	sed 's/LDFLAGS/LOCAL_LDFLAGS/g' -i makefile
-	sed 's/LOCAL_LDFLAGS = -shared/LOCAL_LDFLAGS = -shared ${LDFLAGS}/' -i makefile
-	sed 's/DEBUG=-g -Wno-char-subscripts -O/DEBUG=/' -i makefile
-}
-
-src_install() {
-	INIT_DIR=/usr/share/tinyscheme/
-	newbin scheme tinyscheme
-	dolib libtinyscheme.a libtinyscheme.so
-	insinto ${INIT_DIR}
-	doins init.scm
-	dodir /etc/env.d/ && echo "TINYSCHEMEINIT=\"${INIT_DIR}init.scm\"" > "${D}"/etc/env.d/50tinyscheme
-}
diff --git a/dev-scheme/tinyscheme/tinyscheme-1.39-r1.ebuild b/dev-scheme/tinyscheme/tinyscheme-1.39-r1.ebuild
deleted file mode 100644
index ae5313effcc8..000000000000
--- a/dev-scheme/tinyscheme/tinyscheme-1.39-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/tinyscheme/tinyscheme-1.39-r1.ebuild,v 1.1 2010/07/01 16:14:51 chiiph Exp $
-
-EAPI="3"
-
-inherit flag-o-matic
-
-MY_P=${PN}${PV}
-
-DESCRIPTION="Lightweight scheme interpreter"
-HOMEPAGE="http://tinyscheme.sourceforge.net"
-SRC_URI="mirror://sourceforge/tinyscheme/${MY_P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	sed -e 's/PLATFORM_FEATURES = -DUSE_STRLWR=0/#PLATFORM_FEATURES = -DUSE_STRLWR=0/;
-		s/CC = gcc -fpic/CC = gcc -fpic ${CFLAGS}/;
-		s/LDFLAGS/LOCAL_LDFLAGS/g;
-		s/LOCAL_LDFLAGS = -shared/LOCAL_LDFLAGS = -shared ${LDFLAGS}/;
-		s/DEBUG=-g -Wno-char-subscripts -O/DEBUG=/' \
-		-i makefile || die "sed failed"
-	append-ldflags "-Wl,-soname,lib${PN}.so.${PV}"
-}
-
-src_install() {
-	local INIT_DIR=/usr/share/${PN}/
-	newbin scheme ${PN} || die "newbin failed"
-	dolib libtinyscheme.a libtinyscheme.so || die "dolib failed"
-	dodoc Manual.txt || die "dodoc failed"
-	insinto ${INIT_DIR}
-	doins init.scm || die "doins failed"
-	dodir /etc/env.d/ && echo "TINYSCHEMEINIT=\"${INIT_DIR}init.scm\"" > "${D}"/etc/env.d/50tinyscheme
-}
diff --git a/dev-scheme/tinyscheme/tinyscheme-1.40.ebuild b/dev-scheme/tinyscheme/tinyscheme-1.40.ebuild
deleted file mode 100644
index cb89fe4370c6..000000000000
--- a/dev-scheme/tinyscheme/tinyscheme-1.40.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/tinyscheme/tinyscheme-1.40.ebuild,v 1.2 2011/11/30 14:51:15 grobian Exp $
-
-EAPI="3"
-
-inherit flag-o-matic multilib
-
-DESCRIPTION="Lightweight scheme interpreter"
-HOMEPAGE="http://tinyscheme.sourceforge.net"
-SRC_URI="mirror://sourceforge/tinyscheme/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x64-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-#S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-#	cp makefile makefile.old
-
-	#separate lines, because shell comments are weak
-	sed 's/CC = gcc -fpic/CC = gcc -fpic ${CFLAGS}/' -i makefile
-	sed 's/LDFLAGS/LOCAL_LDFLAGS/g' -i makefile
-	sed 's/LOCAL_LDFLAGS = -shared/LOCAL_LDFLAGS = -shared ${LDFLAGS}/' -i makefile
-
-	sed 's/DEBUG=-g -Wno-char-subscripts -O/DEBUG=/' -i makefile
-	sed "s/LD)/& -Wl,-soname,lib${PN}.so.${PV}/" -i makefile
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		append-flags -DOSX
-		sed -i \
-			-e 's/SOsuf=so/SOsuf=dylib/' \
-			-e "s|\(\$(LD)\)[^\$]\+\(\$(\)|\1 -Wl,-install_name,${EPREFIX}/usr/lib/lib${PN}.${PV}.dylib \2|" \
-			makefile || die
-	fi
-
-#	diff -u makefile.old makefile
-}
-
-src_install() {
-	newbin scheme ${PN} || die "newbin failed"
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# this should be done for ELF (all other systems) as well, but only
-		# Darwin/MachO is strict in the install_name (soname) actually pointing
-		# somewhere, so we won't change the ELF scheme here (up to maintainer)
-		mv libtinyscheme$(get_libname) libtinyscheme$(get_libname ${PV}) || die
-		ln -s libtinyscheme$(get_libname ${PV}) libtinyscheme$(get_libname) || die
-		dolib libtinyscheme$(get_libname ${PV}) || die "dolib failed"
-	fi
-	dolib libtinyscheme.a libtinyscheme$(get_libname) || die "dolib failed"
-	dodoc Manual.txt || die "dodoc failed"
-
-	# Bug 328967: dev-scheme/tinyscheme-1.39-r1 doesn't install header file
-	insinto /usr/include/
-	newins scheme.h tinyscheme.h || die "newins scheme.h tinyscheme.h failed"
-
-	local INIT_DIR=/usr/share/${PN}/
-	insinto ${INIT_DIR}
-	doins init.scm || die "doins failed"
-	dodir /etc/env.d/ && echo "TINYSCHEMEINIT=\"${EPREFIX}${INIT_DIR}init.scm\"" > "${ED}"/etc/env.d/50tinyscheme
-}
diff --git a/dev-tcltk/tkpiechart/tkpiechart-6.5.ebuild b/dev-tcltk/tkpiechart/tkpiechart-6.5.ebuild
deleted file mode 100644
index 31f2eb9c8126..000000000000
--- a/dev-tcltk/tkpiechart/tkpiechart-6.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkpiechart/tkpiechart-6.5.ebuild,v 1.7 2013/04/30 16:26:31 ulm Exp $
-
-DESCRIPTION="create and update 2D or 3D pie charts in a Tcl/Tk application"
-HOMEPAGE="http://jfontain.free.fr/piechart6.htm"
-SRC_URI="http://jfontain.free.fr/${P}.tar.bz2"
-
-LICENSE="jfontain"
-KEYWORDS="x86 ~ppc ~amd64"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/tk-8.3
-	dev-tcltk/tcllib"
-
-src_install() {
-	dodir /usr/lib/tkpiechart
-	./instapkg.tcl "${D}"/usr/lib/tkpiechart || die
-
-	dodoc CHANGES CONTENTS COPYRIGHT INSTALL README TODO
-	dohtml *.gif *.html
-	docinto demo
-	dodoc demo*
-}
diff --git a/dev-tcltk/tktable/Manifest b/dev-tcltk/tktable/Manifest
index 60a7f4ad5214..446fc5d412fd 100644
--- a/dev-tcltk/tktable/Manifest
+++ b/dev-tcltk/tktable/Manifest
@@ -1,2 +1 @@
 DIST Tktable2.10.tar.gz 284135 SHA256 c335117fa1be45fe4d3032e96fd4b4641fff6a4f8467878608dabed11198a4cb SHA512 d69b1c766abb2833f48c900ca4d4fd3927f138ddf728dd76f2087a784604daa4356ec60a146e71d2fb2508a644598711e0373cb81dbfb0272b7ad16a0754e899 WHIRLPOOL 514be8c8048c947ddb9a59c35105f4f81848de51aa70d6961a739b8077683019baa583042dd4a1e807e51abdcd51ab95f9f69e3a0963a7c6c21fc456c023ea6d
-DIST Tktable2.9.tar.gz 272816 SHA256 f2279b3b6ab0353d6d5bb28d344768160516ddb543e7193d545ac2f4f5293ee1 SHA512 e1147948509257e1ef76d9f240013d27ece868d28bcd45e8382f55bcf5b9664587d97dd4f992fb61d8185182813222c95b5f865f381f9bd43cae23efe9ecae2a WHIRLPOOL af1562202a4ccc89291f632fefaf5b5862ab6bec03d4ce69f7f54d5f48b2f74863c78fd7e9ac5246cbc29b7056b8d64094b9ed078afb7b3de48ddf8246f23b38
diff --git a/dev-tcltk/tktable/tktable-2.9.ebuild b/dev-tcltk/tktable/tktable-2.9.ebuild
deleted file mode 100644
index 0a212e4327d9..000000000000
--- a/dev-tcltk/tktable/tktable-2.9.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tktable/tktable-2.9.ebuild,v 1.7 2011/04/07 15:04:39 jlec Exp $
-
-MY_P="Tktable${PV}"
-
-DESCRIPTION="full-featured 2D table widget"
-HOMEPAGE="http://tktable.sourceforge.net/"
-SRC_URI="mirror://sourceforge/tktable/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ppc x86"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=dev-lang/tk-8.0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i -e "s/relid'/relid/" "${S}"/{configure,tclconfig/tcl.m4} || die
-}
-
-src_compile() {
-	econf
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-}
diff --git a/dev-tcltk/tkzinc/Manifest b/dev-tcltk/tkzinc/Manifest
index 806fb912c32f..ade994aa06bf 100644
--- a/dev-tcltk/tkzinc/Manifest
+++ b/dev-tcltk/tkzinc/Manifest
@@ -1,2 +1 @@
 DIST Tkzinc-3.3.6plus.tar.gz 1924729 SHA256 6a23a647a2062bc9f5a773092cbb6c63ee5e7564a8c8751839dcca79d807ff56 SHA512 ead998b69569ebec92e7f60415296262f60b91250b2fe15fdeb9fb71c38756006bedcd9ed2829d915cb6ce3a6461165a48c9037f8e397ba6049a76ae474f7838 WHIRLPOOL 65e30a3e3bd553145d918373f272cf7969a02111ed3b18fd407f234357ffc0223449b1e85796d5e501e8020eb616624ebbf1b4c1d2b1bc365399ded45ebdb552
-DIST zinc-tk_3.3.4.tar.gz 2785947 SHA256 5f65fd1bf8e2d26736c892758b74259eb8642346b92d6467ea8653b5f744e26c SHA512 ed73637ec6abfc61b6f9ca87e38a4cd8c93764bc541828f06c6d130de7ebc528bce62e95af429015558b4f2d4bb6d33b45c581188a420b04aa3f416324cf8d69 WHIRLPOOL 3b41e3b1dcad597774a491f475a90f380a0ac09c8f6220054a53a8bb0f1d462eb0ea352a08fa22ecbda964df4ac75056eeff0909edb91be1e91897fd1fad69f4
diff --git a/dev-tcltk/tkzinc/tkzinc-3.3.4.ebuild b/dev-tcltk/tkzinc/tkzinc-3.3.4.ebuild
deleted file mode 100644
index 19099ae26d3e..000000000000
--- a/dev-tcltk/tkzinc/tkzinc-3.3.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkzinc/tkzinc-3.3.4.ebuild,v 1.6 2014/08/10 21:26:29 slyfox Exp $
-
-EAPI="3"
-
-inherit autotools eutils
-
-DESCRIPTION="A Tk widget library"
-HOMEPAGE="http://www.tkzinc.org"
-SRC_URI="http://www.tkzinc.org/Packages/zinc-tk_${PV}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE="debug doc threads"
-
-DEPEND="
-	dev-lang/tk
-	media-libs/glew
-	virtual/opengl
-	doc? ( virtual/latex-base )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/Tkzinc"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PV}-ldflags.patch \
-		"${FILESDIR}"/${P}-latex.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared \
-		--enable-gl=damage \
-		$(use_enable debug symbols) \
-		$(use_enable threads)
-}
-
-src_compile() {
-	emake || die "make failed"
-	if use doc ; then
-		emake pdf || die "make pdf files failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	dodoc BUGS README || die
-	dohtml -r doc/* || die
-	use doc && dodoc doc/refman.pdf
-}
diff --git a/dev-tcltk/vtcl/vtcl-1.6.0.ebuild b/dev-tcltk/vtcl/vtcl-1.6.0.ebuild
deleted file mode 100644
index 27a88b805f6f..000000000000
--- a/dev-tcltk/vtcl/vtcl-1.6.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/vtcl/vtcl-1.6.0.ebuild,v 1.5 2014/08/10 21:26:50 slyfox Exp $
-
-DESCRIPTION="Visual Tcl is a high-quality application development environment"
-HOMEPAGE="http://vtcl.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
-IUSE="doc"
-DEPEND="dev-lang/tk"
-
-MY_DESTDIR=/usr/share/${PN}
-src_compile() {
-	./configure || die
-	sed -i 's,^\(VTCL_HOME=\).*,\1'${MY_DESTDIR}',g' vtcl	|| die "Path fixing failed."
-}
-
-src_install() {
-	dodir ${MY_DESTDIR} || die "Directory creation failed."
-	dobin vtcl || die
-	cp -r ./{demo,images,lib,sample,vtcl.tcl} ${D}/${MY_DESTDIR} || die "Data installation failed."
-	dodoc ChangeLog LICENSE README
-	use doc && dodoc doc/tutorial.txt
-	use doc && dohtml doc/*html
-}
diff --git a/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild b/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild
index 1298bd53ad87..8647a17455e7 100644
--- a/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild
+++ b/dev-util/buildbot-slave/buildbot-slave-0.8.12.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/buildbot-slave/buildbot-slave-0.8.12.ebuild,v 1.1 2015/04/24 20:36:58 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot-slave/buildbot-slave-0.8.12.ebuild,v 1.4 2015/06/27 13:26:22 zlogene Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux"
 IUSE="test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot/buildbot-0.8.12.ebuild b/dev-util/buildbot/buildbot-0.8.12.ebuild
index ad7525066d3a..b66063bbbbef 100644
--- a/dev-util/buildbot/buildbot-0.8.12.ebuild
+++ b/dev-util/buildbot/buildbot-0.8.12.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/buildbot/buildbot-0.8.12.ebuild,v 1.1 2015/04/24 20:33:30 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.8.12.ebuild,v 1.4 2015/06/27 13:25:35 zlogene Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="doc examples irc mail manhole test"
 
 RDEPEND=">=dev-python/jinja-2.1[${PYTHON_USEDEP}]
diff --git a/dev-util/scala-ide/Manifest b/dev-util/scala-ide/Manifest
new file mode 100644
index 000000000000..f5a6019d6734
--- /dev/null
+++ b/dev-util/scala-ide/Manifest
@@ -0,0 +1,2 @@
+DIST scala-SDK-4.1.0-vfinal-2.11-linux.gtk.x86.tar.gz 232347349 SHA256 1d7054b49195b598d469a2d56971f67aa219c6043cb8209f8c8608160c4df7ad SHA512 f3d8bff300ee772e07f9c9287c37428d5ddf50bd750dcc86b6a28d9ad5a0b891fa8ce810599e754ac06bf48786a9c58b981055c29976c37b2c530466591d171a WHIRLPOOL f584d8d6e129f5464f9eb44ab7137e230dc0b701e07d3569a7975e35a5ecc2a4f6b81e085486f36867b00a9715e1e25b5cd29294c638abe195f4a60677aa61f9
+DIST scala-SDK-4.1.0-vfinal-2.11-linux.gtk.x86_64.tar.gz 232491001 SHA256 d3e9efe1176d979dc0fe2a9457f70068b5a3fd23635a07bcd5639e2345897aca SHA512 d5b8fe3cb3d6623e2f29e0ad5d279b363143c9b392ea5d91092ecb9de765828ac0c50c74ff879f7c825099b22a833ad3acbb0c2cfcd51c769ee19082905b63eb WHIRLPOOL 8007d41e9695c6ae5c3094906ebc6fba263d8d005f6763ce70eb4398db266ea1aff64bc4bc24bc216d0e869e839a92298bb3f85f8149608dd2986d36a3863def
diff --git a/dev-util/scala-ide/metadata.xml b/dev-util/scala-ide/metadata.xml
new file mode 100644
index 000000000000..68b30527c024
--- /dev/null
+++ b/dev-util/scala-ide/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>java</herd>
+  <maintainer>
+	  <email>monsieurp@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-util/scala-ide/scala-ide-4.1.0.ebuild b/dev-util/scala-ide/scala-ide-4.1.0.ebuild
new file mode 100644
index 000000000000..3f39191f18b6
--- /dev/null
+++ b/dev-util/scala-ide/scala-ide-4.1.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scala-ide/scala-ide-4.1.0.ebuild,v 1.1 2015/06/28 11:55:10 monsieurp Exp $
+EAPI=5
+
+inherit java-pkg-opt-2
+
+SRC_URI_AMD64="http://downloads.typesafe.com/scalaide-pack/${PV}-vfinal-luna-211-20150525/scala-SDK-${PV}-vfinal-2.11-linux.gtk.x86_64.tar.gz"
+SRC_URI_X86="http://downloads.typesafe.com/scalaide-pack/${PV}-vfinal-luna-211-20150525/scala-SDK-${PV}-vfinal-2.11-linux.gtk.x86.tar.gz"
+
+DESCRIPTION="The Scala IDE"
+HOMEPAGE="http://www.scala-ide.org"
+KEYWORDS="~amd64 ~x86"
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+SLOT="0"
+LICENSE="BSD"
+
+DEPEND=">=virtual/jdk-1.6
+	|| (
+		dev-lang/scala
+		dev-lang/scala-bin
+	)"
+RDEPEND=">=virtual/jre-1.6"
+
+MY_D="/opt"
+
+src_unpack() {
+	unpack ${A}
+	mv "${WORKDIR}"/eclipse "${WORKDIR}"/"${P}"
+}
+
+src_prepare() {
+	mv "${WORKDIR}"/"${P}"/eclipse "${WORKDIR}"/"${P}"/"${PN}"
+}
+
+src_install() {
+	cd "${D}" || die
+	dodir "${MY_D}" || die
+	insinto "${MY_D}"
+	doins -r "${WORKDIR}"/"${P}" || die
+	insopts -m 0755
+	insinto "${MY_D}"/"${P}"
+	doins "${WORKDIR}"/"${P}"/"${PN}" || die
+	dosym ${MY_D}/${P}/${PN} /usr/bin/${PN} || die
+}
diff --git a/dev-util/trinity/Manifest b/dev-util/trinity/Manifest
index 6c0e6d668c35..6ef37bd6965b 100644
--- a/dev-util/trinity/Manifest
+++ b/dev-util/trinity/Manifest
@@ -2,3 +2,4 @@ DIST trinity-1.1.tgz 115894 SHA256 926a1d6595d9fc29ad79075b6603e4bbfe42df3e04215
 DIST trinity-1.2.tgz 171946 SHA256 71132fca0ed016dcb39a3f1d9fa16a68971e2e9eff0b94bbacdf3d7ff101b6d5 SHA512 5a96db85ce0a34c345c803c6983bc4f191a8c25d54ff90f61eafeb6cb747a4170097821bf070a77920831a35a19b8d2bbc7b32d51194e45060abbd235a96b0d7 WHIRLPOOL 3713baba7a7e0a3f8996a8eee658d9905129aeb5d7f8a42179851c0e17b33aae9dbfaa206ff27b3b1786c47ccb8d4d45ba0732df09c689e1341133bcb3f0d119
 DIST trinity-1.3.tgz 192513 SHA256 53ea7ca66c022e1fd86b18a7a38f5dbbf3611a15e1bb1256ea6e8ac570378b0f SHA512 343dac85a2c7a433e3d1e71535e16285f766ded240d2e7ba0527e29ab46cb39e11e2134f95255e8792f0cd21a5fd55f90a34a3a9d348414d03e9e0bd06437f36 WHIRLPOOL c2ff46ad957ec6541f3898000a7e6982f9a34eaa0b849db601cf84a2570131baf1e7817f7c5bd517e8b492880c957d8d5527fec6944fefb5ba24e6c51f276fb8
 DIST trinity-1.4.tar.xz 156212 SHA256 a61fca0e35010820be4ba858dd7d103e6cc5975feef052f2cf56db71c8661ac1 SHA512 ffe7e5e9214056b39c0047ddd6463885701d075256a9416749cba638c625898eb7b0e2f74a17794fd4034dafdc949b8297e842815bb9b6d29392059a6a0d549b WHIRLPOOL 8df2d1a22e3259e00363f71010f723a421109022478dfe8bd318fa0304ec9baa705ad089e535545026066649e751d7c4d310ccfd92561a1dc0692c1df1695658
+DIST trinity-1.5.tar.xz 171684 SHA256 e7b641d21954873bac7b5c27e7a9986837e83ec14fa20c55901c4333cce22655 SHA512 58884c8e226258de6037e06029b6c593a99b467e9b107562458557954fd4af185f88fbcacc04fc52f05318a860ebab4605c227e6a02b32253439807d4071cd8d WHIRLPOOL e737ac877b95a62e40a2cc9273f0b0d4dc79275b6dafab85b54815f1581c9c824189d88781cc26468c56166f6e87273fc5df1b786b69069b1dc4654d2a874f43
diff --git a/dev-util/trinity/files/trinity-1.5-flags.patch b/dev-util/trinity/files/trinity-1.5-flags.patch
new file mode 100644
index 000000000000..bb48287e1d83
--- /dev/null
+++ b/dev-util/trinity/files/trinity-1.5-flags.patch
@@ -0,0 +1,11 @@
+--- trinity-1.5/Makefile
++++ trinity-1.5/Makefile
+@@ -10,7 +10,7 @@
+ CC := $(CROSS_COMPILE)$(CC)
+ LD := $(CROSS_COMPILE)$(LD)
+ 
+-CFLAGS += -Wall -W -g -O2 -I. -Iinclude/ -Wimplicit -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE -D__linux__
++CFLAGS += -Wall -W -I. -Iinclude/ -Wimplicit -D_GNU_SOURCE -D__linux__
+ ifneq ($(SYSROOT),)
+ CFLAGS += --sysroot=$(SYSROOT)
+ endif
diff --git a/dev-util/trinity/trinity-1.5.ebuild b/dev-util/trinity/trinity-1.5.ebuild
new file mode 100644
index 000000000000..8488cb1ad448
--- /dev/null
+++ b/dev-util/trinity/trinity-1.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/trinity/trinity-1.5.ebuild,v 1.1 2015/06/27 04:58:14 radhermit Exp $
+
+EAPI=5
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="A Linux system call fuzz tester"
+HOMEPAGE="http://codemonkey.org.uk/projects/trinity/"
+SRC_URI="http://codemonkey.org.uk/projects/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="
+	app-arch/xz-utils
+	sys-kernel/linux-headers
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-flags.patch
+	tc-export CC
+}
+
+src_configure() {
+	./configure.sh || die
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	dobin ${PN}
+	dodoc Documentation/* README
+
+	if use examples ; then
+		exeinto /usr/share/doc/${PF}/scripts
+		doexe scripts/*
+		docompress -x /usr/share/doc/${PF}/scripts
+	fi
+}
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 1c09fcaa7200..1e55bf6a5873 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,3 +1,4 @@
+DIST umockdev-0.8.10.tar.xz 741364 SHA256 5105caf49c240148a826871ee6576e99ed902ea8b58d7908b0dfd121a9f8319d SHA512 74eb2bd58fad181c52a4a968d9cfd895f1723052d046b21a9381a8bf293a135173d1e218c55b824c4cd285fe0f6ae99764d4e4c0c35c55ee9bb08c3bea03292e WHIRLPOOL 912f814fb05520fdc7d18f81b10c1b0ecba0d890086735963b6becfcd685bb4e60d63953792a04d84483f47f54a74b81e20ad717c044305bf56b76d27b2b9bb2
 DIST umockdev-0.8.2.tar.xz 733196 SHA256 8d7dad9ec6f9105773d1bb57eb844310e7a05ba850c0f28b9b520f848b2a2719 SHA512 a7674abcde7f570d92da4e54bbe7448ffde99515577c05664ea11ed45dcab7345e62b96d42f6e851b8dc5199dfaf7955a54156ae4bc9ffc983a5ccf312755514 WHIRLPOOL 0774f85f09d6e2d03fd500143a0b56a31cbda561e693b46b236d8641f336edc91d05206a36f408911baddce42c9a0aede9a4d6a71830b2e0f17a0859170ba028
 DIST umockdev-0.8.8.tar.xz 741304 SHA256 51fb5f81d895f99c3a3d81a18356db7e6d2cd075732477d8d4be4ffd97817e3f SHA512 5a8991111a7a108e965e4e1446c050dc544ddf7dc4a35db7374be0373b0f74415b3bcc1192547ce32a91ed91e373f5b750adb18a4c4efc2c587f9d03625d417c WHIRLPOOL c2c8dc304dcafbee9dfb8047a41b71ed1ee36905d7a0bcbe46fb2a67110580279bf5ff293636d2030e6cd43f4ab4ee885be76a3c44c76469967d10e1e7867dde
 DIST umockdev-0.8.9.tar.xz 740428 SHA256 5a4e6b43d99c6cad52bd22d7d713ff2d5dcc4db4147c01d08d174606de095adf SHA512 bac7b39eae1623e42db80dc39517d0f7f6c5264be65c089789d5cb17bd7f45584fab6e5930cd44d9b7e4dae987db31a2876b20310a9297f676c38b7461a1ab7b WHIRLPOOL b7253b50f130252c36c23079e454fc346ab9abc5131355c7abcb4573368bcf3d6a71af82563c79276df8c29e97210cadf6195ff498619b61b1734e1be86244ea
diff --git a/dev-util/umockdev/umockdev-0.8.10.ebuild b/dev-util/umockdev/umockdev-0.8.10.ebuild
new file mode 100644
index 000000000000..8e95e1042bf5
--- /dev/null
+++ b/dev-util/umockdev/umockdev-0.8.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/umockdev/umockdev-0.8.10.ebuild,v 1.1 2015/06/27 04:52:44 radhermit Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit python-any-r1 autotools-utils
+
+DESCRIPTION="Mock hardware devices for creating unit tests"
+HOMEPAGE="https://github.com/martinpitt/umockdev/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs test"
+
+RDEPEND="virtual/libgudev:=
+	virtual/libudev:=
+	>=dev-libs/glib-2.32:2"
+DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+RESTRICT="test"
diff --git a/dev-util/weka/Manifest b/dev-util/weka/Manifest
index de14d1d7aab4..91f6154144cf 100644
--- a/dev-util/weka/Manifest
+++ b/dev-util/weka/Manifest
@@ -1 +1,2 @@
+DIST weka-3-6-12.zip 24335916 SHA256 504f8ccc0915cd6664eb6aff74bcf5b3796dbdd55917e0b37c3d976cc38eb069 SHA512 4301e1c2a751e26ff8d860e24e54e71511276f8cb90020c935595aaaab547f8614381ca8087b83a670d13ef0ff3fa13084f4984b9249e16042703ef9f43c0bd1 WHIRLPOOL 0c09e8c476f69ae0b13ebdd03ca220ffebd0aa0369597fc3424d7e71be81acb817e46a725d42d56d9679e032e414d9533eb79f03393f2b93b740cb44ed86b91a
 DIST weka-3-6-6.zip 22444607 SHA256 a548bea251b7e774427158cfbd52f2d22706cebde1bde703748f3c7df4519e1c SHA512 e06e4a2b213fb161255d3c5ab3dfa4e176ddfc40ff8261608957d2fcd101eddde2cec789bf15f99d2c75156a4b5c42e28a1702d27ac8c09967a54f8321781f6e WHIRLPOOL 412759cdd2c8ef24c39171926f299c658057f72ebba32b492812d1f63a10c15430f559997a991b57aa411d3f752ef949bc7761116640931ca0b707a007a3266e
diff --git a/dev-util/weka/metadata.xml b/dev-util/weka/metadata.xml
index a21ab42c8384..90427530e907 100644
--- a/dev-util/weka/metadata.xml
+++ b/dev-util/weka/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>
+	<maintainer>
+	    <email>amynka@gentoo.org</email>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">weka</remote-id>
 	</upstream>
diff --git a/dev-util/weka/weka-3.6.12.ebuild b/dev-util/weka/weka-3.6.12.ebuild
new file mode 100644
index 000000000000..c23839082028
--- /dev/null
+++ b/dev-util/weka/weka-3.6.12.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/weka/weka-3.6.12.ebuild,v 1.1 2015/06/28 07:46:04 amynka Exp $
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2 versionator
+
+MY_P="${PN}-$(replace_all_version_separators '-')"
+DESCRIPTION="A Java data mining package"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+HOMEPAGE="http://www.cs.waikato.ac.nz/ml/weka/"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	>=dev-java/javacup-0.11a_beta20060608:0"
+RDEPEND=">=virtual/jre-1.6
+	>=dev-java/javacup-0.11a_beta20060608:0"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+EANT_BUILD_TARGET="exejar"
+EANT_DOC_TARGET="docs"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+
+weka_get_max_memory() {
+	if use amd64; then
+		echo 512m
+	else
+		echo 256m
+	fi
+}
+
+java_prepare() {
+	unzip -qq "${PN}-src.jar" -d . || die "Failed to unpack the source"
+	rm -v *.jar lib/*.jar || die
+	rm -rf doc || die
+	java-pkg_jar-from --into lib javacup
+	epatch "${FILESDIR}"/${P}-build.xml.patch
+	sed -i -e "s/256m/$(weka_get_max_memory)/g" build.xml || die
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_dolauncher weka --main "${PN}.gui.GUIChooser"
+
+	# Really need a virtual to list all available drivers and pull the ones
+	# instaled
+	java-pkg_register-optional-dependency hsqldb,jdbc-mysql,mckoi-1
+
+	use source && java-pkg_dosrc src/main/java/weka/
+
+	dodoc README || die
+	if use doc; then
+		java-pkg_dojavadoc doc/
+		insinto /usr/share/doc/${PF}
+		doins WekaManual.pdf || die
+	fi
+
+	dodir /usr/share/${PN}/data/
+	insinto /usr/share/${PN}/data/
+	doins data/*
+
+	newicon "${S}/weka.gif" "${PN}".png
+	#make_desktop_entry "${PN}" "Waikato Environment for Knowledge Analysis" "${PN}" "Education;Science;ArtificialIntelligence;" "Comment=Start Weka"
+}
diff --git a/dev-util/weka/weka-3.6.6-r1.ebuild b/dev-util/weka/weka-3.6.6-r1.ebuild
index e95574d23f8d..75b800ed2691 100644
--- a/dev-util/weka/weka-3.6.6-r1.ebuild
+++ b/dev-util/weka/weka-3.6.6-r1.ebuild
@@ -1,8 +1,8 @@
-# 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-util/weka/weka-3.6.6-r1.ebuild,v 1.4 2012/08/23 05:46:36 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/weka/weka-3.6.6-r1.ebuild,v 1.5 2015/06/28 07:46:04 amynka Exp $
 
-EAPI="3"
+EAPI="5"
 
 JAVA_PKG_IUSE="doc source"
 
diff --git a/dev-vcs/cvs2cl/Manifest b/dev-vcs/cvs2cl/Manifest
index 878e80ea6b7b..e2b2eae157f0 100644
--- a/dev-vcs/cvs2cl/Manifest
+++ b/dev-vcs/cvs2cl/Manifest
@@ -1,2 +1 @@
-DIST cvs2cl-2.59.pl.bz2 25179 SHA256 938a9ce471b43a7234504f21a7c30f90ce7db0a609b34ab87d9d705512e63c2c SHA512 14715e0cc049218624a90714926a9edc767f85b0e4831bb1baf28fe387845470bfcd501e34ef30a2f259b5f61c35765299aad55498f62a9ffd6b28aeadbfeaf5 WHIRLPOOL 45b0b058a241904e99b2ca5efd8b21cf89aaee253d4a188f33628ea60b3e4060beb9bfed53f54c4385fd6c52685c0310b2357af4b7d6e440b260777322148e3b
 DIST cvs2cl-2.71.pl.bz2 25347 SHA256 f7a86512f30b73cf2fe63e5e7e68fa3fc9607ab498dafbec704b3f02132f67d9 SHA512 de9e8465da56bec5b541a588e0d2a73f49e060fcadbde33ca63a7c4f93edf37cc50aa3271c4ad466430d3315b95c27d642325bd885ec7afdd6a75586d15d9dbe WHIRLPOOL 2deef9614c0a2061c9663762bbdc46dfc303883d92630d48d54c4dec5f6b4c3516cf34581cbe6d56344b639718f01ce868a3a62951b1509d8c3a01532b53aa7a
diff --git a/dev-vcs/cvs2cl/cvs2cl-2.59.ebuild b/dev-vcs/cvs2cl/cvs2cl-2.59.ebuild
deleted file mode 100644
index 70b6263d5526..000000000000
--- a/dev-vcs/cvs2cl/cvs2cl-2.59.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvs2cl/cvs2cl-2.59.ebuild,v 1.2 2012/03/18 15:45:27 armin76 Exp $
-
-DESCRIPTION="produces a GNU-style ChangeLog for CVS-controlled sources"
-HOMEPAGE="http://www.red-bean.com/cvs2cl/"
-SRC_URI="mirror://gentoo/${P}.pl.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-S=${WORKDIR}
-
-src_install() {
-	newbin ${P}.pl ${PN} || die
-}
diff --git a/dev-vcs/cvsd/Manifest b/dev-vcs/cvsd/Manifest
index ca0375edc8d2..9da8110e311b 100644
--- a/dev-vcs/cvsd/Manifest
+++ b/dev-vcs/cvsd/Manifest
@@ -1,4 +1,2 @@
-DIST cvsd-1.0.16.tar.gz 234898 SHA256 5df200df15e211d12678ee8c166eb0d286996d4fa5af6963fc64bb5b67e7060f SHA512 e490e5f37f440d209f53631ad23b27124e96f7408be4e3f99c3b3e35812161067bbd16ebb21aa8405f67c3d744a18304c7e1b1638d065e2b6de95f99f87df13a WHIRLPOOL c76ce8af8eac45d4604979833298420543ec54b5ba5b6b5f20d90b90d1d07ab7238b0e4421c37cee0431ca0e789cb6c3594e287cb4fd508e196a93ddda972038
 DIST cvsd-1.0.17.tar.gz 247026 SHA256 49d6a0c95bbb2c2e87f549eea8941ca115e6eb147c9720f8fb88678c84c0802a SHA512 beea48a288ff580e6cc7fdcd1997b7af01e7ea1b1c185006c92cd7758e7e557d2b1b4fc820bd03b787ebc74b5fa9ef661584d2c523480cf6418f452f5f929c9d WHIRLPOOL 2fa9ae2e679933c3777b4e124f2a4733056120d591f61b1cb711642f76c2f3fa59e30eb9275ddf90f8caf6d49ba395e7e1d4c085ade1214493c7f0294b02492b
 DIST cvsd-1.0.7.tar.gz 193964 SHA256 0a5891f3e2bff1bd8b304d5a7ce8426df635dc73fd5f690464c17430844c89c5 SHA512 6ffc3d554e43d50c0fa4861b3f6cc6c696298d882074f017da80068f7afbca3361e5d88fbd13fcadf930afee2df8d6a0777710bc0f992dd208b7674595cc8ea1 WHIRLPOOL 4f0d3dbe7267087747d7174cce941808091f88c146e4809acec3b4b9afb1ea715d094630ceaacf6feb34752b7603413f52422e1e2d7d232784015669bbcfcd76
-DIST cvsd-1.0.8.tar.gz 198676 SHA256 ccc59a2f744e888f346455c736b198391680d0dd1fccec0ffc90a6b6d0d7f459 SHA512 566323699a7f6e3d84e48db02f1b9b29750213efa081adffd890deedd656ad9ba6ec30edf00876944f2de437e95310832a5070ee1f05530e61d5f256ac558308 WHIRLPOOL fed655ce126d6d457bd581fb5395125449100b23eb9d744229988bd5c32d7969de4723882b0ae8de1776916fc7c5bad3accfb4dee44d94669759f1e4894b0b8c
diff --git a/dev-vcs/cvsd/cvsd-1.0.16.ebuild b/dev-vcs/cvsd/cvsd-1.0.16.ebuild
deleted file mode 100644
index f3197562edfb..000000000000
--- a/dev-vcs/cvsd/cvsd-1.0.16.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvsd/cvsd-1.0.16.ebuild,v 1.3 2014/08/10 21:22:45 slyfox Exp $
-
-inherit eutils user
-
-DESCRIPTION="CVS pserver daemon"
-HOMEPAGE="http://ch.tudelft.nl/~arthur/cvsd/"
-SRC_URI="http://ch.tudelft.nl/~arthur/cvsd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="tcpd"
-
-DEPEND=">=dev-vcs/cvs-1.11.6
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-RDEPEND="${DEPEND}
-	>=dev-lang/perl-5.8.0"
-
-pkg_setup() {
-	enewgroup cvsd
-	enewuser cvsd -1 -1 /var/lib/cvsd cvsd
-}
-
-src_compile() {
-	econf $(use_with tcpd libwrap) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dosed 's:^Repos:# Repos:g' /etc/cvsd/cvsd.conf
-	keepdir /var/lib/cvsd
-
-	dodoc AUTHORS ChangeLog FAQ INSTALL NEWS README TODO
-
-	newinitd "${FILESDIR}/cvsd.rc6" ${PN}
-}
-
-pkg_postinst() {
-	elog "To configure cvsd please read the README in "
-	elog "/usr/share/doc/${PF}/"
-}
diff --git a/dev-vcs/cvsd/cvsd-1.0.8.ebuild b/dev-vcs/cvsd/cvsd-1.0.8.ebuild
deleted file mode 100644
index 99184e44c36f..000000000000
--- a/dev-vcs/cvsd/cvsd-1.0.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/cvsd/cvsd-1.0.8.ebuild,v 1.3 2014/08/10 21:22:45 slyfox Exp $
-
-inherit eutils user
-
-DESCRIPTION="CVS pserver daemon"
-HOMEPAGE="http://ch.tudelft.nl/~arthur/cvsd/"
-SRC_URI="http://ch.tudelft.nl/~arthur/cvsd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="tcpd"
-
-DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-RDEPEND="${DEPEND}
-	>=dev-lang/perl-5.8.0
-	>=dev-vcs/cvs-1.11.6"
-
-pkg_setup() {
-	enewgroup cvsd
-	enewuser cvsd -1 -1 /var/lib/cvsd cvsd
-}
-
-src_compile() {
-	econf $(use_with tcpd libwrap) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	dosed 's:^Repos:# Repos:g' /etc/cvsd/cvsd.conf
-	keepdir /var/lib/cvsd
-
-	dodoc AUTHORS ChangeLog FAQ INSTALL NEWS README TODO
-
-	newinitd "${FILESDIR}"/cvsd.rc6 ${PN}
-}
-
-pkg_postinst() {
-	elog "To configure cvsd please read the README in "
-	elog "/usr/share/doc/${PF}/"
-}
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index d8d4aba534b7..6359439948b1 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -4,27 +4,24 @@ DIST git-2.0.5.tar.xz 3437996 SHA256 f5a63f5073c7f10d0676d0dabb46df48f2af77624fe
 DIST git-2.1.4.tar.xz 3544804 SHA256 a04968b9b10cbcb31a7054aa3a0d11ac47c83556ecd270ddef1987df5d3d053e SHA512 17333eda9600287be1f366271f314619354f6bc9b7f867d59a9493441e71a963340cedf728b5954ac6311f5426a928a2beacfa7775e1a4d439b58e0dcf310a0b WHIRLPOOL fc20c64e0d494a13834c71ffa5c727018fc3940f4dc65ae4eda6ba14af2faf2864d779e706b503c69a16858ca051878e27bcfe1883c3c206dda6129a1bc5aceb
 DIST git-2.2.2.tar.xz 3592264 SHA256 aa6d2efcc0c7bb9b9edc6d56d90921706b833972f1d2abe70f71be7838f22d05 SHA512 e3ca6f40de04ed940f521fff4c7e92446e40ad1627acc5b4c090ebf114dcf279d4b1f3efe1189ffa43192fce412165621fc12ea90e2f7d02a6a9ccda655dc69b WHIRLPOOL 9e20def83bbb9b11cb5982fc5f19b09767657ff80f02a237dff6ddaddd3209b4cfb9288bec1b6dc80c6a6db1869cfcaa90e2374279012fc8215771c1a58a1fc2
 DIST git-2.3.6.tar.xz 3621716 SHA256 3ce01c54e92b47366756f57742280e052412efde65344e31f51ad8a48a7c60fc SHA512 53ad21db0fa6bb48ee24302c35ee929b1bd1fae3b646845523e7105b8539700cef23e2425170dec0311c7e746c41b743cfd78f192613b586291e44b49c3c284d WHIRLPOOL 12cf33fc19efea4f885a9b5c6d7099893b92742ffaad8e407016abfc5232ddd4763db95fc657a185830e2f904cdb2b04e8ad1c4305f09d77ff8f7db07c139799
-DIST git-2.3.7.tar.xz 3621804 SHA256 eb4696943f82ab55be71048d6e640942b78cd179ec501989aff8706b57f6515b SHA512 87502626d228c8c231794cc8fde29175578c1a5d4bc69aa2fd722f5a2ca3860cdb8c54aaa679fc56bdd498810e75af60e568bf4ff3375f5ff54fdc98a46e2fce WHIRLPOOL 982797f9fe540fe980a3c566d1b77b9342a420e21df97203a4e7990988b8eef7f7a37aba4f7158ca72db01a16c8f1f90a9b94b5c492a184ead8c1be98896928f
 DIST git-2.3.8.tar.xz 3622512 SHA256 cb4d9228f63b7a9500d55383878bb4bbb60b80deb7ae1a5858c7103ba14de5a6 SHA512 bf693fbe7fc16a240470501af2a7736ebfdbf027c0cc8adbd601d2b1c98ec7d968959e06dd8a3d0e206dc351e83a161475191d59d76f9e2da3e13b4de8716fb4 WHIRLPOOL 93aa2d832e57181de25035952a566c9d3330105e277930f088eb10e2073120c296b6dd87375437c9e9b7880c9b56e2c0de0fda5f77f0da9d2f96840c2fe8eda8
-DIST git-2.4.3.tar.xz 3687444 SHA256 f05007a9d1ef28c3d84091ddf7ce5d29c2df2272f34b4dd8b24e09274280d814 SHA512 ae9647e121d8aae9a57a2ae1d1b0474c94b8663b61c41d4dbf50e83e85fb78cfc794452fd1eeb9e31ddc784d1b78babe789c8be7bc80e7dc9884fa1ba9cb0633 WHIRLPOOL a7e62ce2217eeb6bbfad7d13c78d65898a144fb72ed944a19632e5c14a51de950c7afa7d08d4d3a1130980e1463b3d62851d6217ae6ed5946773d8ad61ae0c27
 DIST git-2.4.4.tar.xz 3689492 SHA256 f873b15d42281474fcba5921295d01e48a3cd3cddcbeb3d60176bf30f5f30260 SHA512 b4d3401d1e4f40f74f8eb75194d1edf0107786b942cf5e3fd127e4a268ce31ec4954195519444cc84e34caca4569d6fd41edafa2037116f60320f2c59c6e7cdf WHIRLPOOL 6fd9d4076586f25154cb448315a1492ffe7acfa5bb811c54e342acc4fcf28da423ab0042f23aa579adefbefa6b3f5dc45c949a36744c94d5420780a2175bde85
+DIST git-2.4.5.tar.xz 3689940 SHA256 c31a5f5f72e025f8fe26845032a06683c7e5c1a73236c2353b5606ddd22e0494 SHA512 bcd28086126236e9640a981a341159fd433891a0ad674886c1a679059551b6c8a3ee5a3dc25771c84199cae2f442085ad92f8afc0f281db5a2d05ce37698cf6a WHIRLPOOL 4f8f27de8adb55a83bd50d1f9ddd9675548da345bc80048ceca2fe1bd82080400b6097a43047a60178eb1e07cf39918e41632bdda48695de04eea178502c78b9
 DIST git-htmldocs-1.8.5.6.tar.gz 2242475 SHA256 7c8e955d0798686fa030ba7b7b384a2eab2b74d5bd695d82faecac2e247bd211 SHA512 c9b2752bcdd7f8f817b14e99ab2743d153e3e7549bffb2aa98999e46d1e965d045850ec6a3e9f6bc83e6e4820ce20f281c33f946ebd2be16d275b85a5ddaee36 WHIRLPOOL 7db3fb74e6b51618890acfef8fb89ab09adf653d3196e82624671194bdb2b564b903429ffecf68b28faf96ce3ebb83b534459738d48ace048d873c158621d31c
 DIST git-htmldocs-1.9.5.tar.gz 2262251 SHA256 4fa289e259d6b922a51d11a687203612aa1aad5696eb83b4e67c0de8a785700f SHA512 2df975c33d3411a97ab5a684b03998b7cd188d05bae6813c753fe2092b0acf463dec49a7a546d315f520fd9c71281da41998d0f36f64f48d4f95507a034a083b WHIRLPOOL edc252ce58b31f001c0d225f0b40b3689028bd34b1cbbdd889d645d37a2931e9039f76f12e5a0f918579a0b9c5dd1f3171af2bb58ee42972411ca33ec0ebe8f2
 DIST git-htmldocs-2.0.5.tar.xz 944792 SHA256 90eaf745d6ee197718fdde9c98919918ad1e4e3576608e4522b84c612cd9ef2a SHA512 e9b3d92d466762c9c7e164e9c30ff0046b262bf4707ea057e3a682f7b15a4f8149a9aaf2630f117dc3b508744cd688c6c0087cc94ff3477e7f3b85513160d7f3 WHIRLPOOL 35970d099304a5ab174fc93f8496a0c651a259dcaa3d23a2dd0233f8db214ae94a26e28044a87460d4654e61440427d331ceeac290335d6ae3fcf0423175bba9
 DIST git-htmldocs-2.1.4.tar.xz 959144 SHA256 7665daecd77c2f9be8b316eb69a1fda3f383f759e71d346a137c8cf39501d886 SHA512 7734d671ab6ca8374f54546b0987821d0c66d136d50f9cbb1ff7c06da25330e46a10ede41d10a60c80847afa68999298c2f90dfe99d51bd862590f02344e1cbd WHIRLPOOL 97326a00a1f613cf95dbeaf8938842855299d21e6963e2040b3bf9ee02a745c8156ea552e2b87248a98d5f0ecd6560a546a4a49b6635ca034ff2e92504bbb00a
 DIST git-htmldocs-2.2.2.tar.xz 976312 SHA256 41179ff0816189d583f290a227a73788002a319c7ff8c5cada970878c50b901d SHA512 b51b7d619e82d83b4f0b90d31bfccc30291a5beb48b2f5e5e59e75e91e5d772e89b560534a683648cd5480f4bf241f733efc87b30062ef5bb003bf0b5dbeed7f WHIRLPOOL c9dc7ac1a40559e4306d7d97a1619a272faf83d8b05c5a11f5f7b010566cd02fe853fee7eb550c6ccf744db446966a9696f9eb6feeee7ce4f976c6aa88b097d2
 DIST git-htmldocs-2.3.6.tar.xz 987292 SHA256 b37439087ae465534588a65380e3acb66d3e6949904ede720febeed1dc5d8b49 SHA512 ccb836c3df4bfb96174500295c630aa1ac3bea475460434e4d097c3e178bec5a0b5037ff17281fe6a6bc7bb3ae6bcac03ee4009611bb222eccaebc3ae6aac81f WHIRLPOOL 8c58f108d1ea95bf552604b956e727dcf7a8f0eed8979239b0b6ab931aceffc76434137b5f76054563a09985bcaad0a03359da8791469adae71a3a8821084d58
-DIST git-htmldocs-2.3.7.tar.xz 987448 SHA256 8e797f1d50ef4f5681fab9bd2e45ac6c1d75b4a87f67d7a55ac37e1befaefc7f SHA512 7ec6ca9c43fdae5469eb2d81cd2c4325e3baf28028c0170077b0fef4f5c2620ee5c4ae15f021eb84e5b11d19dd13b39d38e27e14b162b690f4368a44c5b8a175 WHIRLPOOL 72eb57e299ff6dfff31a041e7ba0b85b5e65f1c163b2bf89de2e34308f2e6849333caa7d433d3352e55dc112ab60f48b777056618ee3c99ba67ceb643a8f99ef
 DIST git-htmldocs-2.3.8.tar.xz 987840 SHA256 54b8d98e34bceeac906ffa8b7c93e8a2cd2cf3c7f4d0c0334e9d5e0c704ca23f SHA512 7aa72d55a6a2687a3ecb26f9db76f69e4003c87864b8239068b029a9d63f99a023bf76ec3ea60952ecf11608d2d684f4ad1b2ac76942cd44ec67bdf8f497330f WHIRLPOOL 60145b5a48a6780b0edb3a7ef50b3649193818e3aa8199de94dd9bf1cca110d7411902c8e7e3df881eec77aa59208780b60b946aeb5f13960de954af6fd88fbe
-DIST git-htmldocs-2.4.3.tar.xz 993204 SHA256 5a6f6ef9c992eef29b62d8e963ba508583b917f14a374e0fbba3fe50a44c111a SHA512 55fbcffc89336083975ebdfc0123bdd7ee7d72cb02d54250684360dc5fc324209e5ae57a8f6bded65d850714b84c9322bbbea30c769389d5af67cd7599486478 WHIRLPOOL bb38b49cb28ada1e174fb8be8a6b41d19dcb941f0dd79955ce58deb31603288540fc2a4fe11b615a8984b143f69b6e6800243c53988d31a81adbe7342d483433
 DIST git-htmldocs-2.4.4.tar.xz 994376 SHA256 e7f411f3eb3ecccc87e7d96afdcd8e72734a331170412eb37f240b731b2c2580 SHA512 1133dfa8a92358dbe6de35e22822b63bfbd418e8cd6290e1201738e5fc707fed1f50937d921f5323147cae75b89d452e8bd82768046685d7d2017dcd842766aa WHIRLPOOL 4684d5c4b7d8c7477ce658bd804280caab0721957786cb096a0acdf170e01a97d90eed7aca1d1f976ec79347cd9501c3ebed7ddf663ae785988e2abf36d9c054
+DIST git-htmldocs-2.4.5.tar.xz 994632 SHA256 69f0297d4ba56597ae5837366d5fd87c450f1476a743a5933d2974fdad6e8285 SHA512 abb3c1963c84d0eec8740208a8a4ed892ebc8bd7377c35a53af828961530efc7134805eaaec0dc99d48f40c03c38e8526f8a3bbec6cc03ceb3a82a4b594bf7a4 WHIRLPOOL a62453a54dd9474f309c0ad3a5e75d900c771fc541c83d8cab464f96d6ea7eff30a9f318a160a2b0bcd06b15bbd7d3212b510500e5b68600689903e507308593
 DIST git-manpages-1.8.5.6.tar.gz 569061 SHA256 58ef7cb3121639b8d78e2e4c4f7f886bab57af9e9e137b10f372dfad573872c1 SHA512 a524a1c7e8bdc73ffe04bebb5c7050a18c8649b98714bf255c8e3c32a2443d8d5abf33e3ca2eb108d601f01e0bda50fed1e134ffdae87bcf6f551cbbd250c4ba WHIRLPOOL 2db62b96e972dbcbec1ac59d7244bf2c2ff7140c941d1d3c6b9062bd79b80541d7fa3982c5a3bc55a18fc9112ab3fa648966be5c3e1135ab7b5c89080bee82b6
 DIST git-manpages-1.9.5.tar.gz 571625 SHA256 37cc735c4ced6574e8e93349d52d30372fc6f9fe3de3d6b9934a14857d6aade8 SHA512 e3df3e933fed6ff2845989a0146b28789452e9583bc19dd4a9ad335f64b15feffbdc4dd7cdb9d6b5216f7f85837318cf9b10df033f8022777f91c2b0894fb231 WHIRLPOOL e25d77fd8d9cacb92d45fd50640bc65189d02d7e23b276ccaf3b35ba1fe64ab0c49045d1fb8983b7b2b5bd996e767508446ac76506b074ded10feef1f9256918
 DIST git-manpages-2.0.5.tar.xz 359000 SHA256 3cf1581da2a19c0651df445ee5f801e108619befe8965e01d61faa46ca57b642 SHA512 b3981565a34a203283801b86717386971ef53c2f5c47bdde290aa0df4d62045ecbcab1ff1b4d1d8ddf7d489e74d65b0208d87ace7ca8c8be9525be548e445425 WHIRLPOOL e8c78eb38cb3192455ccb991a4ce5cd3988d06f1f06cdf0722e4ce6fb1d4e57f618058cf07d312bcab4f5821a1b1dfc016c03626d4f3429d3e5ef089607a2801
 DIST git-manpages-2.1.4.tar.xz 361252 SHA256 01070bc96e88231f6f279b031fed2919efea8b442fe724f37349ad951d010b04 SHA512 35fe0dd9e0fe9547362abc0e9c5b066abc13a4137b4ea62569fa5b1ae93831da0686e8783be946a9b87274fbc2322ef93425b9d3fc1257023176c772b21b79b2 WHIRLPOOL 9f199eb94657149b51cb20fb55878cb1cf83fa3741906ce37a66b0157df9ca4dae66754fe264019e6bd8e7d286040fec718b89ca4b40b803c059c46521a5cc61
 DIST git-manpages-2.2.2.tar.xz 369876 SHA256 d30688bb62763bf1b87f5eaf4c0a66c68999e479ccd2963108a5f6f82138147c SHA512 5c2220bb09f199ad4fe5c1bc20a813a6c62daab5e6e7fa87bf24861d25b7f7e0fdde215c4f59d8895badd7c361ed202e7837de48d2d54a155d24759db39dd4e1 WHIRLPOOL 45acc45663f13faf5b8197516bb934723bf84cd6db929443e2bd9fc3a915baf258ee93e782741e088a5f799115ea4ee6043225fc9ea9ec954feed21ba54c9be4
 DIST git-manpages-2.3.6.tar.xz 371620 SHA256 b1356f5cb3e7bf53445b08f24ea6950ef1f80031aedd6cd90e3ec60ff1f06b02 SHA512 c7ff2e6aea8c0c12009f29724c899e606b6620e7d408ee3c536fb5239ebcaa0b790a6ee1287dccd88df8776fbc2e72e799124426dbacd82e12f05e3f9f3c909a WHIRLPOOL 7117ba84d888ea448807f3bf51f958b86de011afed1bbad78abf4390c1a77f799f77781f4d9bf1e9287ab903b912b7ca270433c1f4a1f112a4cb4840dde3d400
-DIST git-manpages-2.3.7.tar.xz 371556 SHA256 77e783b0ff15f6c0048bb6c4b79b141dd045516a45fe72c2a4b6fe1434e476ae SHA512 fb8a79c5b058faee528f70df93f9743b2bc2399e0b0737cccf26691f9d5a2697430587a95706dc70d2130cf56139ecf5c0b172a5ea475f0c2d333d481bbcbb9c WHIRLPOOL b475367033b3444c098cf225abe1d127d30b3adc9313b07f15145f67ef5ee49bd89e8ddabc253e7d3378c360fc30ec69a110365b3c3f5333f7d1bd66e225a248
 DIST git-manpages-2.3.8.tar.xz 371528 SHA256 4d38de9decf80864480fcd5cc58783e3bff4e22383b281193acd82ffa3751fe2 SHA512 8c6aaf60e4b6505ae6789fa658ff15534cf5dfa51c03fdf47a624723b75a8448d71faa9f4ee61c5c243b775c4047dd2ffffc664b37e7f38b60c90fc56252ed93 WHIRLPOOL c6068de21f53e20ec17cd724059d91781e81abf617c2169c1099997afdeac371a59927d9db0b98c1f64c66b3de016b351b08a2f37a43038a924137f6f139a72e
-DIST git-manpages-2.4.3.tar.xz 373072 SHA256 91e1a9cb4a35c141bd875063fedc0409ecb676e828204afabc75c3b4c7b844cc SHA512 98ffa7d7407300b63f07d0b7d27604efa99e602fc316359624b43312de983422611ca68d2a13634cc5421e1ac14914d45e9b933f55957854075a3a6476dfb1f1 WHIRLPOOL 915ba5bdb165c7a5f46c888b6517bfce7baad1f628554ca85aa6274ba5f52229af97bc7219e566baeced7b5393389b661781ccb2fe4ab56672a0c3fd70b86499
 DIST git-manpages-2.4.4.tar.xz 373400 SHA256 4bf125ece40f33872c6d9ccd6d83ec0068de5216b4075eaee78e39d46b08c351 SHA512 548bebf0843beaa3b4962ddb711e002904b940e820815717959a2ada2fd0b2489b5f6112debd5192c47d18c867fc9c7c4fcb2fb219d7ce39356b7807d236c2a3 WHIRLPOOL 2be153a1f04da7062a1fef114fc77ceb35ade4fe773c3777c5469bf0803044022a6dbfd8a7fb16c2c051126142166bad7d9b22fe8b32bdf6c934a74337e4c413
+DIST git-manpages-2.4.5.tar.xz 373488 SHA256 abe54047035302a22aed13118c4fcb58e423d0c1ba61dcbc3843b822246fed3e SHA512 04152958fff29a39619348858c2c08d54076459d27bafc80f0ac849d9292d7b139ae65d593f7243ce65fa496c8444a5f084b36334ca90054030e4ce01e861b0a WHIRLPOOL 72da49b87190917e5557acc4796692df81ce6eaafd0ce4fba99ba774ab84fa258987dd8079676d41411e0d41fea11edc0adeb4a75cb65426d09de75f78a9d216
diff --git a/dev-vcs/git/git-2.4.3.ebuild b/dev-vcs/git/git-2.4.3.ebuild
deleted file mode 100644
index 940c46ac2edf..000000000000
--- a/dev-vcs/git/git-2.4.3.ebuild
+++ /dev/null
@@ -1,636 +0,0 @@
-# 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.4.3.ebuild,v 1.2 2015/06/13 17:16:03 dilfridge Exp $
-
-EAPI=5
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-[[ ${PV} == *9999 ]] && SCM="git-2"
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-EGIT_MASTER=pu
-
-inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_GOOG="http://git-core.googlecode.com/files"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	KEYWORDS="~alpha ~amd64 ~arm ~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"
-SLOT="0"
-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"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	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 )"
-
-RDEPEND="${CDEPEND}
-	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? ( dev-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_USEDEP}]
-		>=dev-python/pygtksourceview-2.10.1-r1:2[${PYTHON_USEDEP}]
-	)
-		${PYTHON_DEPS} )"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	subversion? ( perl )
-	webdav? ( curl )
-	gtk? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts+=" BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts+=" PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=" NO_EXPAT=YesPlease"
-	else
-		myopts+=" NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of broken build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# For svn-fe
-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	use iconv \
-		|| myopts+=" NO_ICONV=YesPlease"
-	use nls \
-		|| myopts+=" NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts+=" NO_TCLTK=YesPlease"
-	use pcre \
-		&& myopts+=" USE_LIBPCRE=yes" \
-		&& extlibs+=" -lpcre"
-	use perl \
-		&& myopts+=" INSTALLDIRS=vendor" \
-		|| myopts+=" NO_PERL=YesPlease"
-	use python \
-		|| myopts+=" NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts+=" NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts+=" NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts+=" NO_CVS=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts+=" NO_MMAP=YesPlease"
-#		myopts+=" NO_IPV6=YesPlease"
-#		myopts+=" NO_STRLCPY=YesPlease"
-#		myopts+=" NO_MEMMEM=YesPlease"
-#		myopts+=" NO_MKDTEMP=YesPlease"
-#		myopts+=" NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts+=" NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=" NEEDS_LIBICONV=YesPlease"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=" ASCIIDOC8=YesPlease"
-	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-	export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-2_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	epatch "${FILESDIR}"/git-2.2.2-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	epatch "${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	epatch "${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	epatch_user
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb/gitweb.cgi \
-			|| die "emake gitweb/gitweb.cgi failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die "cd credential/osxkeychain"
-		git_emake || die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		git_emake || die "emake git-credential-gnome-keyring failed"
-	fi
-
-	cd "${S}"/contrib/subtree
-	git_emake
-	use doc && git_emake doc
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-
-	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		use doc && dohtml -p ${d} Documentation${d}*.html
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	if use python && use gtk ; then
-		python_doscript "${S}"/contrib/gitview/gitview
-		dodoc "${S}"/contrib/gitview/gitview.txt
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	cd "${S}"
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake install
-		cd "${S}"
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/gnome-keyring
-		dobin git-credential-gnome-keyring
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		dobin svn-fe
-		dodoc svn-fe.txt
-		use doc && doman svn-fe.1 && dohtml svn-fe.html
-		cd "${S}"
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# credential/gnome-keyring TODO
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	for i in \
-		buildsystems convert-objects fast-import \
-		hg-to-git hooks remotes2config.sh rerere-train.sh \
-		stats workdir \
-		; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-}
-
-src_test() {
-	local disabled="" #t7004-tag.sh" #520270
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.3.7.ebuild b/dev-vcs/git/git-2.4.5.ebuild
similarity index 99%
rename from dev-vcs/git/git-2.3.7.ebuild
rename to dev-vcs/git/git-2.4.5.ebuild
index 7a2688e10749..2fac60b8790c 100644
--- a/dev-vcs/git/git-2.3.7.ebuild
+++ b/dev-vcs/git/git-2.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-vcs/git/git-2.3.7.ebuild,v 1.2 2015/06/13 17:16:03 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-2.4.5.ebuild,v 1.1 2015/06/27 12:36:28 polynomial-c Exp $
 
 EAPI=5
 
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 3233cffa00a9..5fcf937f22a3 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.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/kde5-functions.eclass,v 1.8 2015/06/08 12:27:32 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde5-functions.eclass,v 1.9 2015/06/27 22:02:21 johu Exp $
 
 # @ECLASS: kde5-functions.eclass
 # @MAINTAINER:
@@ -26,12 +26,12 @@ esac
 # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL
 # @DESCRIPTION:
 # Minimal Frameworks version to require for the package.
-: ${FRAMEWORKS_MINIMAL:=5.10.0}
+: ${FRAMEWORKS_MINIMAL:=5.11.0}
 
 # @ECLASS-VARIABLE: PLASMA_MINIMAL
 # @DESCRIPTION:
 # Minimal Plasma version to require for the package.
-: ${PLASMA_MINIMAL:=5.3.0}
+: ${PLASMA_MINIMAL:=5.3.1}
 
 # @ECLASS-VARIABLE: KDE_APPS_MINIMAL
 # @DESCRIPTION:
@@ -218,7 +218,7 @@ punt_bogus_dep() {
 	local prefix=${1}
 	local dep=${2}
 
-	pcregrep -Mn "(?s)find_package\(\s*${prefix}.[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}"
+	pcregrep -Mn "(?s)find_package\s*\(\s*${prefix}.[^)]*?${dep}.*?\)" CMakeLists.txt > "${T}/bogus${dep}"
 
 	# pcregrep returns non-zero on no matches/error
 	if [[ $? != 0 ]] ; then
@@ -232,7 +232,7 @@ punt_bogus_dep() {
 	sed -e "${first},${last}s/${dep}//" -i CMakeLists.txt || die
 
 	if [[ ${length} = 1 ]] ; then
-		sed -e "/find_package(\s*${prefix}\s*REQUIRED\s*COMPONENTS\s*)/d" -i CMakeLists.txt || die
+		sed -e "/find_package\s*(\s*${prefix}\s*REQUIRED\s*COMPONENTS\s*)/d" -i CMakeLists.txt || die
 	fi
 }
 
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 51dcae4e4b6d..d579f622c182 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.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/kde5.eclass,v 1.10 2015/05/31 15:51:21 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde5.eclass,v 1.11 2015/06/27 22:02:21 johu Exp $
 
 # @ECLASS: kde5.eclass
 # @MAINTAINER:
@@ -142,10 +142,7 @@ case ${KDE_AUTODEPS} in
 		fi
 
 		if [[ ${KDE_BLOCK_SLOT4} = true && ${CATEGORY} = kde-apps ]]; then
-			RDEPEND+="
-				!kde-apps/${PN}:4
-				!kde-base/${PN}
-			"
+			RDEPEND+=" !kde-apps/${PN}:4"
 		fi
 		;;
 esac
@@ -376,11 +373,20 @@ kde5_src_prepare() {
 	# enable only the requested translations
 	# when required
 	if [[ ${KDE_BUILD_TYPE} = release ]] ; then
-		for lang in $(ls po 2> /dev/null) ; do
-			if ! has ${lang} ${LINGUAS} ; then
-				rm -rf po/${lang}
-			fi
-		done
+		if [[ -d po ]] ; then
+			pushd po > /dev/null
+			for lang in $(ls) ; do
+				if ! has ${lang} ${LINGUAS} ; then
+					if [[ ${lang} != CMakeLists.txt ]] ; then
+						rm -rf ${lang}
+					fi
+					if [[ -e CMakeLists.txt ]] ; then
+						comment_add_subdirectory ${lang}
+					fi
+				fi
+			done
+			popd > /dev/null
+		fi
 
 		if [[ ${KDE_HANDBOOK} = true ]] ; then
 			pushd doc > /dev/null
diff --git a/eclass/kernel-2.eclass b/eclass/kernel-2.eclass
index 8beeac62ebad..30b8707e6f94 100644
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.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/kernel-2.eclass,v 1.305 2015/05/30 16:09:05 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kernel-2.eclass,v 1.310 2015/06/27 17:41:20 mpagano Exp $
 
 # Description: kernel.eclass rewrite for a clean base regarding the 2.6
 #              series of kernel with back-compatibility for 2.4
@@ -65,6 +65,9 @@
 # K_LONGTERM			- If set, the eclass will search for the kernel source
 #						  in the long term directories on the upstream servers
 #						  as the location has been changed by upstream
+# K_KDBUS_AVAILABLE		- If set, the ebuild contains the option of installing the
+#						  kdbus patch.  This patch is not installed without the 'kdbus'
+#						  and 'experimental' use flags.
 # H_SUPPORTEDARCH		- this should be a space separated list of ARCH's which
 #						  can be supported by the headers ebuild
 
@@ -451,6 +454,10 @@ if [[ ${ETYPE} == sources ]]; then
 	DESCRIPTION="Sources based on the Linux Kernel."
 	IUSE="symlink build"
 
+	if [[ -n ${K_KDBUS_AVAILABLE} ]]; then
+		IUSE="${IUSE} kdbus"
+	fi
+
 	# Bug #266157, deblob for libre support
 	if [[ -z ${K_PREDEBLOBBED} ]] ; then
 		# Bug #359865, force a call to detect_version if needed
@@ -1013,7 +1020,14 @@ unipatch() {
 					UNIPATCH_DROP+=" 5000_enable-additional-cpu-optimizations-for-gcc.patch"
 				fi
 			fi
-		fi
+
+			# if kdbus use flag is not set, drop the kdbus patch
+            if [[ $UNIPATCH_DROP != *"5015_kdbus*.patch"* ]]; then
+				if ! has kdbus ${IUSE} ||  ! use kdbus; then
+					UNIPATCH_DROP="${UNIPATCH_DROP} 5015_kdbus*.patch"
+				fi
+			fi
+ 		fi
 	done
 
 	#populate KPATCH_DIRS so we know where to look to remove the excludes
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
index 3509366fbd4f..085f05ceaf88 100644
--- a/eclass/multilib-build.eclass
+++ b/eclass/multilib-build.eclass
@@ -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/eclass/multilib-build.eclass,v 1.65 2014/12/13 08:41:37 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.66 2015/06/26 20:43:13 mgorny Exp $
 
 # @ECLASS: multilib-build.eclass
 # @MAINTAINER:
@@ -513,14 +513,6 @@ _EOF_
 					sed -e "/${MULTILIB_ABI_FLAG} /s&error.*&include <${CHOST}${f}>&" \
 						-i "${wrapper}" || die
 
-					# Hack for emul-linux-x86 compatibility.
-					# It assumes amd64 will come after x86, and will use amd64
-					# headers if no specific x86 headers were installed.
-					if [[ ${ABI} == amd64 ]]; then
-						sed -e "/abi_x86_32 /s&error.*&include <${CHOST}${f}>&" \
-							-i "${wrapper}" || die
-					fi
-
 					# Needed for swig.
 					if multilib_is_native_abi; then
 						sed -e "/Native ABI/s&error.*&include <${CHOST}${f}>&" \
diff --git a/games-action/cs2d/Manifest b/games-action/cs2d/Manifest
index d51101d9d20c..fa4f0b718b85 100644
--- a/games-action/cs2d/Manifest
+++ b/games-action/cs2d/Manifest
@@ -1,3 +1,5 @@
 DIST cs2d.png 479 SHA256 4114a718e4e1c9b6686571d41f2e66598940e112f129b2c858b2d75ba4f0e607 SHA512 e8894771deedb8e5018d0be986a53920e8f37fe10485df499e4c271d14014701cf345858ba7904ab6db4178f2cb2244684620a6c5ceacba26f62a29c3bd0463b WHIRLPOOL fb831b0ac2ba015f759bd83bee10289031eb62f8ec0cdd3e550fd3b42db1223ff1450d40eb339f85f997bafb1befb65885918674fa38662400dcc155aec0b285
 DIST cs2d_0123_linux.zip 866041 SHA256 8bf7642999718af788991eb5aa0a1924bf7f4090f6b035434e237b4e0ac99d32 SHA512 93979b83bcee95cacc933f05cf8aecf223b52d4cbea006d3c9a9c5f4cb1f72ab7dc07e102ce4915ad84fd208db5a5e7ebfeec89ee342ca806ccbc5a22692d0fc WHIRLPOOL ad9f6d09ac609acf3fdd2f9137970e02a3aca1cdbf5a5f79d7dc9dcebb06f544dd68fa0a9aac48eebe5f18db55b3b5799a422c4390757d8bddc23560c062c343
 DIST cs2d_0123_win.zip 8107120 SHA256 da3e771bb1219a2037ca00101072ffd20fc89227710dcd9e2f7939b787a1dac5 SHA512 847961422a3451af67024b5c0044291adee7f0edb0832c288e7fa7f9333000de2d0be9c4f12112e199e32b4c1f4b8e61788ed7e0eb6ae2b49d6acbd9ab82726b WHIRLPOOL 340eff3c3436d143b3e01e6c8081c8b995d076cbd10dfce8cd13e4077b29f6741f0b6ec89c5bd9c4fbbd07d642ab3875628a52f6a12cbd902a7858fb86c6f51d
+DIST cs2d_0127_linux.zip 878017 SHA256 69b28886aff60cc128e0ad9845e9d120beb9250cb1c99fc18c65f8de82f115c7 SHA512 738be401192a795e76404cf3a97986fcfba2dc082dcec5c546a1c133a50b0a651b2d1f94885f77d830c90b0c37612e615e47fbf51a6f677a56034be62a8c5a6a WHIRLPOOL b5b4d467643587fcfcb03857f654967cf2bd5c4524a1b6a093350a6b580b14673e58be21cd1b381a9c6140c0181b92a0817f96cc6e330a0a0765f9a3deb445c1
+DIST cs2d_0127_win.zip 8229767 SHA256 e143b48d8ec425a8d0fac65998386a49db6ad32e9c09804605bb8399cf422d9c SHA512 cbc3c7c8246907d8c8d8143679e13144449048df09398b4f25cc50ecae0473d8bc186752418727297da0f79b4b323d272a9e1b97a0b0249243bb9098abc23897 WHIRLPOOL ea014b6f5e29a15b324210dabf1ed5a124b06b32371d88b192f815abfc9ede4771b9c5862f7299b18611fed41191a06b4f0e8d205bd026458fb61425706f34f3
diff --git a/games-action/cs2d/cs2d-0127.ebuild b/games-action/cs2d/cs2d-0127.ebuild
new file mode 100644
index 000000000000..4c2087f76d89
--- /dev/null
+++ b/games-action/cs2d/cs2d-0127.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/cs2d/cs2d-0127.ebuild,v 1.1 2015/06/28 11:08:47 maksbotan Exp $
+
+EAPI=5
+
+inherit eutils games
+
+DESCRIPTION="Counter-Strike 2D is freeware clone of Counter-Strike with some added features in gameplay"
+HOMEPAGE="http://www.cs2d.com/"
+SRC_URI="http://dev.gentoo.org/~maksbotan/cs2d/cs2d_${PV}_linux.zip
+	http://dev.gentoo.org/~maksbotan/cs2d/cs2d_${PV}_win.zip
+	http://dev.gentoo.org/~maksbotan/cs2d/cs2d.png"
+LICENSE="freedist"
+
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND="
+	x86? (
+		media-libs/openal
+		media-libs/freetype:2
+		x11-libs/libX11
+		x11-libs/libXxf86vm
+		virtual/opengl
+	)
+	amd64? (
+		>=media-libs/openal-1.15.1[abi_x86_32(-)]
+		>=virtual/opengl-7.0-r1[abi_x86_32(-)]
+		>=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)]
+		>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
+		>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
+	)"
+
+QA_PREBUILT="opt/cs2d/CounterStrike2D"
+
+S=${WORKDIR}
+
+src_prepare() {
+	# removing windows files
+	rm -f *.exe *.bat || die
+
+	# OpenAL is default sound driver
+	sed -i \
+		-e 's:^sounddriver.*$:sounddriver OpenAL Default:' \
+		sys/config.cfg || die
+}
+
+src_install() {
+	insinto "${GAMES_PREFIX_OPT}"/${PN}
+	doins -r .
+	# avoid file collision with untracked file
+	rm -f "${ED%/}/${GAMES_PREFIX_OPT}"/${PN}/sys/core/started.cfg
+
+	make_desktop_entry CounterStrike2D "Counter Strike 2D"
+	make_desktop_entry "CounterStrike2D -fullscreen -24bit" "Counter Strike 2D - FULLSCREEN"
+	games_make_wrapper CounterStrike2D ./CounterStrike2D \
+		"${GAMES_PREFIX_OPT}"/${PN} "${GAMES_PREFIX_OPT}"/${PN}
+
+	doicon "${DISTDIR}"/${PN}.png
+
+	prepgamesdirs
+
+	# fixing permissions
+	fperms -R g+w "${GAMES_PREFIX_OPT}"/${PN}/maps
+	fperms -R g+w "${GAMES_PREFIX_OPT}"/${PN}/screens
+	fperms -R g+w "${GAMES_PREFIX_OPT}"/${PN}/sys
+	fperms ug+x "${GAMES_PREFIX_OPT}"/${PN}/CounterStrike2D
+}
diff --git a/games-board/goatee-gtk/Manifest b/games-board/goatee-gtk/Manifest
index b3eeef242c63..384d4c29e1f3 100644
--- a/games-board/goatee-gtk/Manifest
+++ b/games-board/goatee-gtk/Manifest
@@ -1,2 +1 @@
-DIST goatee-gtk-0.2.0.tar.gz 50228 SHA256 ee4b7be5c7e14de5a3d6f04b58f3d951c79b379698ea1516b2a0d4fa3bdd740e SHA512 7762e5dcd966ec475ab48ff0aeb7acd9b2eb7b04d8f7d111abbff62de653b093e2697ea70e6976ca8360436df43bd930ae1ba181342641425e070015a62db4bf WHIRLPOOL b0a6b51f46d82efa9cf4192d1adf5c4d13be08cc5e3c56680fa0056c2d623fbfdac47d8c7d6e592bfb1baf68d9660d36b1e07babceb2b63171cfb5d070aab6dc
 DIST goatee-gtk-0.3.0.tar.gz 60381 SHA256 bb9f65956e3bb13d03e42dcbd65c39c40f2d225b881da47d5744b95b34beba71 SHA512 f4af3e1871d8e8c1b2c8df135b58019e2c0574eae165655af34e73c8e18a10ebb8ab0ac095c14a58f3e28250880e4539086e2841b0ed88575ce704de00ce4ada WHIRLPOOL 9e454177f38ef7e6d2e131b562411b239cbd176c20eacd9a95a27f8353931589c25c3feff2a5356576f0e8097c14fe6dbc8b1cdb704759d712be6fed808ed107
diff --git a/games-board/goatee-gtk/goatee-gtk-0.2.0-r1.ebuild b/games-board/goatee-gtk/goatee-gtk-0.2.0-r1.ebuild
deleted file mode 100644
index fb007c8aae4c..000000000000
--- a/games-board/goatee-gtk/goatee-gtk-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/goatee-gtk/goatee-gtk-0.2.0-r1.ebuild,v 1.2 2014/11/24 08:38:22 slyfox Exp $
-
-EAPI=5
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal eutils games
-
-DESCRIPTION="A monadic take on a 2,500-year-old board game - GTK+ UI"
-HOMEPAGE="http://khumba.net/projects/goatee"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-games/goatee-0.2:=[profile?] <dev-games/goatee-0.3:=[profile?]
-	>=dev-haskell/cairo-0.12:=[profile?] <dev-haskell/cairo-0.13:=[profile?]
-	>=dev-haskell/gtk-0.12:2=[profile?] <dev-haskell/gtk-0.13:2=[profile?]
-	>=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	>=dev-libs/gmp-5:=
-	virtual/libffi:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 )
-"
-
-pkg_setup() {
-	games_pkg_setup
-	haskell-cabal_pkg_setup
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--bindir="${GAMES_BINDIR}"
-}
-
-src_compile() {
-	haskell-cabal_src_compile
-}
-
-src_install() {
-	haskell-cabal_src_install
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	ghc-package_pkg_postinst
-	games_pkg_postinst
-}
diff --git a/games-puzzle/enigma/enigma-1.21-r1.ebuild b/games-puzzle/enigma/enigma-1.21-r1.ebuild
index ca763de7c378..6f2fcb6e9e19 100644
--- a/games-puzzle/enigma/enigma-1.21-r1.ebuild
+++ b/games-puzzle/enigma/enigma-1.21-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/games-puzzle/enigma/enigma-1.21-r1.ebuild,v 1.1 2015/05/15 22:19:15 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/enigma/enigma-1.21-r1.ebuild,v 1.3 2015/06/28 11:36:28 zlogene Exp $
 
 EAPI=5
 inherit autotools eutils gnome2-utils games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/enigma-game/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="nls"
 
 COMMON_DEPS="media-libs/sdl-ttf
diff --git a/games-rpg/manaplus/Manifest b/games-rpg/manaplus/Manifest
index 474b8500a0a3..e989460ccff8 100644
--- a/games-rpg/manaplus/Manifest
+++ b/games-rpg/manaplus/Manifest
@@ -1,3 +1,2 @@
 DIST manaplus-1.3.9.29.tar.xz 7206052 SHA256 adf3bbd3761086d66d1d5cf22369dfadcf5839f382c564bd7d6337ad1e3933c3 SHA512 4ae13254b9ee5d06fc8e2f287fa3cde5076a55bcac0f57398acffc70a5d0b3820d712771def6b8f8ce1ef8f48d1ad8ffc222c8821ec43920aff071a24c4a3a6e WHIRLPOOL db33166b184f9ae018a675b6a3d76b8e296530e02550b9dd6803b3249d8b454a1475a5f8020d976ef3153a68532b86f408f5f3af2ca0f9ea34386db8586abb7c
-DIST manaplus-1.5.5.9.tar.xz 9253652 SHA256 a7b7e3f0f4eb1a32793b983321dbb01695c4191404cd64bb9be6c9975f0cd34e SHA512 702f8abea3b944f9bd8e4793bb5f2616a1518ac448cfc1e81f445d37938164ff946a084811d19dee033f561892727233f3717d032cbfea8b297702b17edfedd7 WHIRLPOOL 1e429ae48b2f1d57b32f1876c8e537a50baa8b57ac9302ab4a73112b8d438af6efd4be245a5f070d62869ec6517d646e0184d652d04d816a18e812b5e91abb6d
-DIST manaplus-1.5.6.6.tar.xz 9369668 SHA256 87d2f4b22b3919cab55c2769638bf36b2330c5b9717da9d30807ac027bbe77d5 SHA512 7acf699adeff06bdf00b70143beb288c31293909e1f9356bbf228e665cecf57e2977cc0d0bf7cd1f3579a1caa211ddfb723daf69918bcc70ce69419b50ecde12 WHIRLPOOL 675cd948124320c4cf3ff51aa2497a1bb66d07949cc04030c076b5cef99b7a2bf96887d83f82d8642adea942b1835350b20a79fd3520cf1689515a4efa1a1b3c
+DIST manaplus-1.5.6.20.tar.xz 9376348 SHA256 cee7ce82c730c3e2254bc335023eb5531a3bcb4434a926f8685e16a2651f5b7e SHA512 bec1a2f9e0c034f234ce66836454df7296ce366a55d635713f4ba6103b4ab12d5a0dfd5d00b6b67a935499226e50ed1d1750f37ac70f06017d047015ba3a3627 WHIRLPOOL 728621e395fdb6ba4491e35d25897346cd70676a459c729cb56d258aeb6b413e144e57f5f306a7084511f5c0cbe3425ac25b921f3c5367d7db3696e43e869365
diff --git a/games-rpg/manaplus/manaplus-1.5.5.9.ebuild b/games-rpg/manaplus/manaplus-1.5.6.20.ebuild
similarity index 97%
rename from games-rpg/manaplus/manaplus-1.5.5.9.ebuild
rename to games-rpg/manaplus/manaplus-1.5.6.20.ebuild
index 4b01606a107d..fd07ce2662f5 100644
--- a/games-rpg/manaplus/manaplus-1.5.5.9.ebuild
+++ b/games-rpg/manaplus/manaplus-1.5.6.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/games-rpg/manaplus/manaplus-1.5.5.9.ebuild,v 1.1 2015/05/13 04:10:35 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/manaplus/manaplus-1.5.6.20.ebuild,v 1.1 2015/06/26 23:50:02 mr_bones_ Exp $
 
 EAPI=5
 inherit games
diff --git a/games-rpg/manaplus/manaplus-1.5.6.6.ebuild b/games-rpg/manaplus/manaplus-1.5.6.6.ebuild
deleted file mode 100644
index c574b87c9c36..000000000000
--- a/games-rpg/manaplus/manaplus-1.5.6.6.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/manaplus/manaplus-1.5.6.6.ebuild,v 1.1 2015/06/12 14:33:22 mr_bones_ Exp $
-
-EAPI=5
-inherit games
-
-DESCRIPTION="OpenSource 2D MMORPG client for Evol Online and The Mana World"
-HOMEPAGE="http://manaplus.evolonline.org"
-SRC_URI="http://download.evolonline.org/manaplus/download/${PV}/manaplus-${PV}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls opengl"
-
-RDEPEND="
-	>=dev-games/physfs-1.0.0
-	dev-libs/libxml2
-	media-libs/libpng:0=
-	media-libs/libsdl2[X,opengl?,video]
-	media-libs/sdl2-gfx
-	media-libs/sdl2-image[png]
-	media-libs/sdl2-mixer[vorbis]
-	media-libs/sdl2-net
-	media-libs/sdl2-ttf
-	net-misc/curl
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-misc/xdg-utils
-	x11-apps/xmessage
-	media-fonts/dejavu
-	media-fonts/wqy-microhei
-	media-fonts/liberation-fonts
-	media-fonts/mplus-outline-fonts
-	nls? ( virtual/libintl )
-	opengl? ( virtual/opengl )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	sed -i \
-		-e '/^SUBDIRS/s/fonts//' \
-		data/Makefile.in || die
-}
-
-src_configure() {
-	CONFIG_SHELL=/bin/bash \
-	egamesconf \
-		--with-sdl2 \
-		--without-internalsdlgfx \
-		--localedir=/usr/share/locale \
-		--prefix="/usr" \
-		--bindir="${GAMES_BINDIR}" \
-		$(use_with opengl) \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-	dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusansmono-bold.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSansMono.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusansmono.ttf
-	dosym /usr/share/fonts/dejavu/DejaVuSans.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/dejavusans.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsans-bold.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsansmono-bold.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationMono-Regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsansmono.ttf
-	dosym /usr/share/fonts/liberation-fonts/LiberationSans-Regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/liberationsans.ttf
-	dosym /usr/share/fonts/wqy-microhei/wqy-microhei.ttc "${GAMES_DATADIR}"/${PN}/data/fonts/wqy-microhei.ttf
-	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-bold.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/mplus-1p-bold.ttf
-	dosym /usr/share/fonts/mplus-outline-fonts/mplus-1p-regular.ttf "${GAMES_DATADIR}"/${PN}/data/fonts/mplus-1p-regular.ttf
-
-	prepgamesdirs
-}
diff --git a/games-rpg/wasteland2/Manifest b/games-rpg/wasteland2/Manifest
index ddf326561861..1c3b4506b6fc 100644
--- a/games-rpg/wasteland2/Manifest
+++ b/games-rpg/wasteland2/Manifest
@@ -1 +1 @@
-DIST gog_wasteland_2_1.3.0.7.tar.gz 11430142293 SHA256 848e6b2ef2760ac9d510c4d1aba766f69952672867977cc2fc5c736c94cb7b3f SHA512 8b2776a45448d5b7032d6b73aeddbab52505c7af3c84633621c175a3b86a2317d23d3e8952e629b7ead65a2b3b1c1df1baf02443c3f06f65d01cebf86bfcd9ec WHIRLPOOL 3dbb6b1d81d943a81f13e3f20ea8541160c59ae4634b3f6fa0570ce6abf4c149627b84ccbefe353eef2b2fdf5b9f18f01c0d8e4ee7cb7033fbb1baad3d6c4f5f
+DIST gog_wasteland_2_1.9.0.13.tar.gz 10959158010 SHA256 0f6bf4f806de3233a11ec1049f96d779f8d013dc38f296d101466701fa931728 SHA512 8b5ed19ffee9505efaf03f7ef3ba55dbdbbeda68b7961e92c22776bbb7e842df8c5e5ee727967e79dec753fd03d39f0a1c98e380e540971834b56066b6a79929 WHIRLPOOL d53f4636606c03a5977b9603495f61aaedc3f1851a1ca2bd8b4b2bda6feff8de0f9ec488fa10b052870fbfbea875673f2fe27fafd92ee0c663b0ae158171c2ee
diff --git a/games-rpg/wasteland2/wasteland2-1.3.0.7.ebuild b/games-rpg/wasteland2/wasteland2-1.9.0.13.ebuild
similarity index 95%
rename from games-rpg/wasteland2/wasteland2-1.3.0.7.ebuild
rename to games-rpg/wasteland2/wasteland2-1.9.0.13.ebuild
index 6a5a5d2f079a..17cd9b550e87 100644
--- a/games-rpg/wasteland2/wasteland2-1.3.0.7.ebuild
+++ b/games-rpg/wasteland2/wasteland2-1.9.0.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/games-rpg/wasteland2/wasteland2-1.3.0.7.ebuild,v 1.2 2015/06/14 17:12:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/wasteland2/wasteland2-1.9.0.13.ebuild,v 1.1 2015/06/26 15:44:34 hasufell Exp $
 
 EAPI=5
 
@@ -19,7 +19,6 @@ RESTRICT="bindist fetch mirror"
 QA_PREBUILT="${GAMES_PREFIX_OPT}/${PN}/*"
 
 RDEPEND="
-	virtual/opengl
 	>=dev-libs/atk-2.12.0-r1[abi_x86_32(-)]
 	>=dev-libs/glib-2.40.0-r1:2[abi_x86_32(-)]
 	>=media-libs/fontconfig-2.10.92:1.0[abi_x86_32(-)]
@@ -33,6 +32,7 @@ RDEPEND="
 	>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
 	>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
 	>=virtual/glu-9.0-r1[abi_x86_32(-)]
+	virtual/opengl
 "
 
 S="${WORKDIR}/Wasteland 2"
@@ -58,7 +58,7 @@ src_install() {
 
 	# over 20GB of data
 	dodir "${dir}"
-	mv game/WL2_Data "${D%%/}${dir}"/ || die
+	mv game/WL2_Data "${D%/}${dir}"/ || die
 	exeinto "${dir}"
 	doexe game/WL2
 
diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index a94887c78052..03971e08e63b 100644
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -1,5 +1,2 @@
-DIST simulinux-112-3.zip 3071766 SHA256 2ca8375b44b433e7034dd17515d1f8319d4a04e18960d0d8c828cf7603199e92 SHA512 9e051989761d0c469b070af99b95ad04f1f96e85513664d5ff13b564404bed579217d90f92e5e80069288d0e5db0887a1f1ca9a62250895a58f63ad592d62e7c WHIRLPOOL f2a844e981ec4db115ef9e36e18e8bce8f494063d4d3d1e13e56c9837c382d6559954ef2002e26a40accf82da088aa5cd91001ac7f834134f50472840692b920
-DIST simupak64-112-3.zip 4117394 SHA256 dc443d9ddc1f36e10435f672a03f86d4ad83e33926045b14664f6d2580b56e8b SHA512 7e5997efb52c36a1871e25ca3f278088aa5450f6ba4abb447dd3881438bda4473571166b79719cb8b5879f878538e74c5375683b8d76ddbdd5c575de690c44a9 WHIRLPOOL aa92bd5882827e6c1cb54a99bf92ff6251c31fb37072457b802d499e47e3b3ea5ff52592e56d04d71c6e1e8b2588c57c195793233a0b5322247651a2a3b02d6a
 DIST simupak64-120-0-1.zip 4051769 SHA256 02a709dfa4b0c22e0b463ebcbd9684548356de1c61566cff9c127a79990dbb78 SHA512 21badd251b9018bef55531923e23cb1935c3831784fab028febd3879384330e843329499ab08a08e71238fb92bf7db36e18ecbbc4e719a942e427f58fc634afc WHIRLPOOL 5ae84653b5a138b5a987b7ca6512994f3ba8dff48fffbb94f6fe0bf4845d5537e93734f73174eb328f20b6c9986235ae6c461c55b5efde53a4b81620a3b1da83
-DIST simutrans-src-112-3.zip 1677347 SHA256 8aa9ded7ac65587d65070b950b50f4094b7f77d33d263d1b821a0fe9f214b849 SHA512 0d63da8bed2298dd4516caea748a10c7c27eec2fb00ced9c76600ec93a975a01efa0fe7b4c8f8a5dc9e035b8c1dcf1f7772dfec54594f41efb8c4790d4da99e9 WHIRLPOOL 7ed9310d49339421fed2c4ca8098f21d367de7ad2d933d1d56d5c25542995657f1a98b34066464fbf916ffa4903338bd519fd1e15437017d7899bc2b4c4466f1
 DIST simutrans-src-120-0-1.zip 3909005 SHA256 010a6e3765891e1821364e54f6bcdfb2911b627ffca3acae8350e06e53113683 SHA512 6f32b6f1c12f45125de8a12c4a034387a784e21fd8cdedcf7b1daefd9174d9a94825e8f68effa2ff1436cce2e2bc8cb5707161f3fa004185ae158400840dc450 WHIRLPOOL 36155184f5806a9cfab742f26e3fc78d5d7d928f99cddabbaf36c7c90d065dab02bb174c07d9633958f8b891b0db8cc5c94e45fd4f22d917b9a037c51a99b69a
diff --git a/games-simulation/simutrans/files/simutrans-0.112.3-Makefile.patch b/games-simulation/simutrans/files/simutrans-0.112.3-Makefile.patch
deleted file mode 100644
index a27316438002..000000000000
--- a/games-simulation/simutrans/files/simutrans-0.112.3-Makefile.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- Makefile.orig
-+++ Makefile
-@@ -88,8 +88,6 @@
-       endif
-     endif
-   endif
--else
--  CFLAGS += -O
- endif
- 
- ifdef DEBUG
-@@ -108,6 +106,7 @@
-   endif
- else
-   CFLAGS += -DNDEBUG
-+  CXXFLAGS += -DNDEBUG
- endif
- 
- ifneq ($(PROFILE),)
-@@ -120,6 +119,7 @@
- 
- ifneq  ($(MULTI_THREAD),)
-   CFLAGS += -DMULTI_THREAD=$(MULTI_THREAD)
-+  CXXFLAGS += -DMULTI_THREAD=$(MULTI_THREAD)
-   ifneq  ($(MULTI_THREAD),1)
-     ifeq ($(OSTYPE),mingw)
- #use lpthreadGC2d for debug alternatively
-@@ -134,10 +134,12 @@
-   REV = $(shell svnversion)
-   ifneq ($(REV),)
-     CFLAGS  += -DREVISION="$(REV)"
-+    CXXFLAGS  += -DREVISION="$(REV)"
-   endif
- endif
- 
- CFLAGS   += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)
-+CXXFLAGS   += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(FLAGS)
- CCFLAGS  += -Wstrict-prototypes
- 
- 
-@@ -456,6 +458,7 @@
- ifeq ($(BACKEND),sdl)
-   SOURCES += simsys_s.cc
-   CFLAGS  += -DUSE_16BIT_DIB
-+  CXXFLAGS  += -DUSE_16BIT_DIB
-   ifeq ($(OSTYPE),mac)
-     # Core Audio (Quicktime) base sound system routines
-     SOURCES += sound/core-audio_sound.mm
-@@ -488,6 +491,7 @@
-     endif
-   endif
-   CFLAGS += $(SDL_CFLAGS)
-+  CXXFLAGS += $(SDL_CFLAGS)
-   LIBS   += $(SDL_LDFLAGS)
- endif
- 
-@@ -497,6 +501,7 @@
-   SOURCES += sound/sdl_mixer_sound.cc
-   SOURCES += music/sdl_midi.cc
-   CFLAGS  += -DUSE_16BIT_DIB
-+  CXXFLAGS  += -DUSE_16BIT_DIB
-   ifeq ($(SDL_CONFIG),)
-     SDL_CFLAGS  := -I$(MINGDIR)/include/SDL -Dmain=SDL_main
-     SDL_LDFLAGS := -lmingw32 -lSDLmain -lSDL
-@@ -511,6 +516,7 @@
-     endif
-   endif
-   CFLAGS += $(SDL_CFLAGS)
-+  CXXFLAGS += $(SDL_CFLAGS)
-   LIBS   += $(SDL_LDFLAGS) -lSDL_mixer
- endif
- 
-@@ -544,6 +550,7 @@
-     endif
-   endif
-   CFLAGS += $(SDL_CFLAGS)
-+  CXXFLAGS += $(SDL_CFLAGS)
-   LIBS   += $(SDL_LDFLAGS) -lglew32
-   ifeq ($(OSTYPE),mingw)
-     LIBS += -lopengl32
-@@ -559,6 +566,7 @@
- endif
- 
- CFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
-+CXXFLAGS += -DCOLOUR_DEPTH=$(COLOUR_DEPTH)
- 
- ifneq ($(findstring $(OSTYPE), cygwin mingw),)
-   SOURCES += simres.rc
-@@ -566,7 +574,6 @@
- endif
- 
- CCFLAGS  += $(CFLAGS)
--CXXFLAGS += $(CFLAGS)
- 
- BUILDDIR ?= build/$(CFG)
- PROGDIR  ?= $(BUILDDIR)
diff --git a/games-simulation/simutrans/files/simutrans-0.112.3-overflow.patch b/games-simulation/simutrans/files/simutrans-0.112.3-overflow.patch
deleted file mode 100644
index b50f3b888422..000000000000
--- a/games-simulation/simutrans/files/simutrans-0.112.3-overflow.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- besch/reader/obj_reader.cc.orig
-+++ besch/reader/obj_reader.cc
-@@ -308,7 +308,7 @@
- void obj_reader_t::skip_nodes(FILE *fp,uint32 version)
- {
- 	obj_node_info_t node;
--	char load_dummy[OBJ_NODE_INFO_SIZE], *p;
-+	char load_dummy[OBJ_NODE_INFO_SIZE + 4], *p; // extra 4 for LARGE_RECORD_SIZE
- 
- 	p = load_dummy;
- 	if(  version==COMPILER_VERSION_CODE_11  ) {
diff --git a/games-simulation/simutrans/simutrans-0.112.3.ebuild b/games-simulation/simutrans/simutrans-0.112.3.ebuild
deleted file mode 100644
index fdcefd508632..000000000000
--- a/games-simulation/simutrans/simutrans-0.112.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/simutrans/simutrans-0.112.3.ebuild,v 1.4 2014/10/12 08:52:39 ago Exp $
-
-EAPI=5
-inherit flag-o-matic eutils games
-
-MY_PV=${PV/0./}
-MY_PV=${MY_PV//./-}
-DESCRIPTION="A free Transport Tycoon clone"
-HOMEPAGE="http://www.simutrans.com/"
-SRC_URI="mirror://sourceforge/simutrans/simutrans-src-${MY_PV}.zip
-	mirror://sourceforge/simutrans/simulinux-${MY_PV}.zip
-	mirror://sourceforge/simutrans/simupak64-${MY_PV}.zip"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/libsdl[sound,video]
-	sys-libs/zlib
-	app-arch/bzip2
-	media-libs/libpng:0
-	media-libs/sdl-mixer"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-src_prepare() {
-	strip-flags # bug #293927
-	echo "BACKEND=mixer_sdl
-COLOUR_DEPTH=16
-OSTYPE=linux
-VERBOSE=1" > config.default || die
-
-	if use !x86 ; then
-		echo "FLAGS+= -DUSE_C" >> config.default || die
-	fi
-	# make it look in the install location for the data
-	sed -i \
-		-e "s:argv\[0\]:\"${GAMES_DATADIR}/${PN}/\":" \
-		simmain.cc || die
-
-	epatch \
-		"${FILESDIR}"/${P}-Makefile.patch \
-		"${FILESDIR}"/${P}-overflow.patch
-	rm -f simutrans/{simutrans,*.txt}
-	mv simutrans/get_pak.sh "${T}" || die
-}
-
-src_install() {
-	newgamesbin build/default/sim ${PN}
-	dogamesbin "${T}"/get_pak.sh
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r simutrans/*
-	dodoc documentation/*
-	doicon simutrans.ico
-	make_desktop_entry simutrans Simutrans /usr/share/pixmaps/simutrans.ico
-	prepgamesdirs
-}
diff --git a/games-util/joystick/joystick-1.4.8-r1.ebuild b/games-util/joystick/joystick-1.4.8-r1.ebuild
index 36c5bab9d231..088332bc5c37 100644
--- a/games-util/joystick/joystick-1.4.8-r1.ebuild
+++ b/games-util/joystick/joystick-1.4.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/games-util/joystick/joystick-1.4.8-r1.ebuild,v 1.1 2015/05/16 06:04:45 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/joystick-1.4.8-r1.ebuild,v 1.3 2015/06/28 11:38:23 zlogene Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/linuxconsole/files/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="sdl udev"
 
 DEPEND="sdl? ( media-libs/libsdl:0[video] )
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index bb8cf615fc24..74fb1ff388f8 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,2 +1 @@
-DIST lutris-0.3.6.2.tar.gz 523107 SHA256 1c1c40ef1c994fee70dd3798641efbba08c679a9f2b065abbd508883245db1d2 SHA512 5e97f8689df1a2cc54ccbf92d5a26bcf043494240ac5dc49876ad718ef51194eed12ccb5daeb5dd0a2933c32e11b58add9278ce46c024808c84bb66676650456 WHIRLPOOL 668094516ae1b5461a0830b595817dbcac8f610565df13542d9b2426b7218971a2d528ea039e51b78391fa7c9ffa8292d39ee647779574252e21983c023c0248
 DIST lutris_0.3.6.3.tar.gz 515606 SHA256 a9061403ef8844b2c1443b1c5f15fe98af224d652d66268b47ae8e215e289058 SHA512 548a3a79ffb1c378d923f404634acc3b5eb1055d087ff212cf8a35b7db56650bf616f3b7374ab9fdf996c8f10d80ab602d35d126ef3bb183b9ce55b36d270e97 WHIRLPOOL 9c6e08908a2462f639a89f05b8eea9c212dba103a9c0492d3bd8bba2d2002d718354b4410e6506c7e88c0b4a2bf930d6d05930d0b27d66de0b66b9526f2c2fac
diff --git a/games-util/lutris/lutris-0.3.6.2.ebuild b/games-util/lutris/lutris-0.3.6.2.ebuild
deleted file mode 100644
index 50086a215c25..000000000000
--- a/games-util/lutris/lutris-0.3.6.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/lutris/lutris-0.3.6.2.ebuild,v 1.3 2015/04/19 10:08:58 ago Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,threads"
-
-inherit distutils-r1 gnome2-utils games
-
-DESCRIPTION="Gaming platform for GNU/Linux"
-HOMEPAGE="http://lutris.net/"
-SRC_URI="https://github.com/lutris/lutris/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	gnome-base/gvfs[http]
-	x11-apps/xrandr
-	x11-apps/xgamma
-	x11-misc/xdg-utils"
-
-# INSTALL contains list of optional deps
-DOCS=( AUTHORS README.rst INSTALL )
-
-python_install() {
-	distutils-r1_python_install --install-scripts="${GAMES_BINDIR}"
-}
-
-src_prepare() {
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-	prepgamesdirs
-}
-
-pkg_preinst() {
-	games_pkg_preinst
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-
-	elog "For a list of optional deps (runners), see"
-	elog "/usr/share/doc/${PF}/INSTALL"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/games-util/nml/nml-0.4.1.ebuild b/games-util/nml/nml-0.4.1.ebuild
index b46fba9fdef7..904e4a3c4545 100644
--- a/games-util/nml/nml-0.4.1.ebuild
+++ b/games-util/nml/nml-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/games-util/nml/nml-0.4.1.ebuild,v 1.2 2015/05/19 22:12:57 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/nml/nml-0.4.1.ebuild,v 1.4 2015/06/28 10:09:13 zlogene Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{3_3,3_4} )
@@ -12,7 +12,7 @@ SRC_URI="http://bundles.openttdcoop.org/nml/releases/${PV}/${P}.tar.gz"
 
 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/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index e52fdf666574..37684441c58c 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1 +1 @@
-DIST pyfa-1.11.0.tar.gz 5846954 SHA256 d2c0c4e71604a2fe7dd2557a598a3d7d5abd2cc73a9497a0ce76158e1499adca SHA512 410467d84e016795a8fc36cd57ac06eb07ccb3cc9a7bf09598660f225f2df311a6ad12e5b8f717f55244ed7f815489b45578e6c104279cbee1b8e3a8f6a42d78 WHIRLPOOL 47ceaa3a6f66d7d97df6a69ca1d368684f3444035dc2dbddacc46572957375a65467f4017de19cafd7769d179920e9e0f664702489d34ca034c1700634e50b8f
+DIST pyfa-1.12.0.tar.gz 5898063 SHA256 d22f725efee6cd48a30ccc16a04e913afa1a7e9e89a2004ef8ca12263663ae87 SHA512 c7cda257c0ebffee113df713b8e4a2578fc46ec4493a13341c3907cd8de99c19f4cb1dbae4fe4365134c9ebced618efee2614cb57889a50330d37cf5996ec602 WHIRLPOOL eaf0bc3907b0f32feb601319ca8630e18e8eababb8d3623e56ee3fdc45dfc30946c817e2040e10f0f0e13093672b4faf0e5893088a125bb056d14dd006d623f6
diff --git a/games-util/pyfa/pyfa-1.11.0.ebuild b/games-util/pyfa/pyfa-1.12.0.ebuild
similarity index 95%
rename from games-util/pyfa/pyfa-1.11.0.ebuild
rename to games-util/pyfa/pyfa-1.12.0.ebuild
index 045fb01ab465..42c2bfae7220 100644
--- a/games-util/pyfa/pyfa-1.11.0.ebuild
+++ b/games-util/pyfa/pyfa-1.12.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/pyfa/pyfa-1.11.0.ebuild,v 1.1 2015/05/22 02:57:53 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.12.0.ebuild,v 1.1 2015/06/27 01:55:53 tetromino Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_7 )
diff --git a/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild b/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild
index a9fc8b5b9dbf..fccbe7ada091 100644
--- a/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild
+++ b/gnome-base/gnome-keyring/gnome-keyring-3.16.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/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild,v 1.3 2015/06/20 10:45:41 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-3.16.0-r1.ebuild,v 1.4 2015/06/26 23:04:21 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes" # Not gnome macro but similar
@@ -18,7 +18,7 @@ IUSE="+caps debug pam selinux +ssh-agent test"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 # Replace gkd gpg-agent with pinentry[gnome-keyring] one, bug #547456
-RDEPEND="
+COMMON_DEPEND="
 	>=app-crypt/gcr-3.5.3:=[gtk]
 	>=dev-libs/glib-2.38:2
 	app-misc/ca-certificates
@@ -27,10 +27,12 @@ RDEPEND="
 	caps? ( sys-libs/libcap-ng )
 	pam? ( virtual/pam )
 
-	app-crypt/pinentry[gnome-keyring]
 	>=app-crypt/gnupg-2.0.28
 "
-DEPEND="${RDEPEND}
+RDEPEND="${COMMON_DEPEND}
+	app-crypt/pinentry[gnome-keyring]
+"
+DEPEND="${COMMON_DEPEND}
 	>=app-eselect/eselect-pinentry-0.5
 	app-text/docbook-xml-dtd:4.3
 	dev-libs/libxslt
diff --git a/gnome-base/gnome-light/gnome-light-3.16.0.ebuild b/gnome-base/gnome-light/gnome-light-3.16.0.ebuild
index ea5e29106f35..33c475a60da6 100644
--- a/gnome-base/gnome-light/gnome-light-3.16.0.ebuild
+++ b/gnome-base/gnome-light/gnome-light-3.16.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/gnome-base/gnome-light/gnome-light-3.16.0.ebuild,v 1.1 2015/06/09 23:14:08 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-light/gnome-light-3.16.0.ebuild,v 1.2 2015/06/28 10:47:29 pacho Exp $
 
 EAPI="5"
 
@@ -49,3 +49,9 @@ pkg_pretend() {
 		ewarn "You will have to install and manage a window manager by yourself"
 	fi
 }
+
+pkg_postinst() {
+	# Remember people where to find our project information               
+	elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME"
+	elog "for information about the project and documentation."
+}
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index b2b5a054f42b..f8d7733f2041 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -1,3 +1,2 @@
-DIST gnome-shell-3.14.3.tar.xz 1592136 SHA256 fb44484efb94af4d90189127136a82b2cc1afed93e24834165ae550b58b539d6 SHA512 6a8bcd472ea01962e234668dc54e93de17b20121ece53916f6b1498b7a292cd4eb2d08c56b6903ea6dfd532293f513c09c6648a63d19c1775e23bc77e3087aaa WHIRLPOOL c6c7703822c7652d8a5832c3141c7a2632c3d3422791c8d63608df1b1e8a311e94ce2e88b6f6d6aad608b66cca1297a9906cec3bd01dc92a334d2e68563d077a
 DIST gnome-shell-3.14.4.tar.xz 1597744 SHA256 43336da7edece72bf298f1749510abb8470b625585e551c8b45258981435fd80 SHA512 254536cc3362d968bc624d2e87a5dbfe0471a7dbfb9c43a13e8913a3c097adaa22010bca6fc3fab90106519902d1997b4fa4f9ec6f325667dc3222f06614dc52 WHIRLPOOL 25bb0a0bc5227742e55912082157692d9f71bcf90ff6a3ed7a0b731470cb0a4adba70ba703a302f678746d6cc7263b8ca2fec3b77dae6bcfdd15d694262792a0
 DIST gnome-shell-3.16.2.tar.xz 1592496 SHA256 90b7aeac7673f05f0bf7de39444ac458900c943fa8fd22e5374c047aa54d1838 SHA512 54b9e5c0bcc484e286c6de508c8698452ec00fdcf4dbfc82c812989d69f7adcf5964f93d7284b75dde8f4542538cb7ea6e157f0cb5404fae2dc560474573f6cd WHIRLPOOL 125c645d4ac4f262caee325d76c2666e8bac3ab807074fc7115375d2e0882b6f4f178cd4e63bbfb033eea35d9ce93bfe88e1c4136e3773d811729dc6300718fb
diff --git a/gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild b/gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild
deleted file mode 100644
index 36f249d21d1d..000000000000
--- a/gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild,v 1.8 2015/04/19 02:19:48 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
-
-DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-IUSE="+bluetooth +i18n +networkmanager -openrc-force"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# libXfixes-5.0 needed for pointer barriers
-# FIXME:
-#  * gstreamer support is currently automagic
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-atk-2.5.3
-	>=dev-libs/atk-2[introspection]
-	>=app-crypt/gcr-3.7.5[introspection]
-	>=dev-libs/glib-2.39.1:2
-	>=dev-libs/gjs-1.39
-	>=dev-libs/gobject-introspection-0.10.1
-	>=x11-libs/gtk+-3.13.2:3[introspection]
-	>=media-libs/clutter-1.15.90:1.0[introspection]
-	>=dev-libs/json-glib-0.13.2
-	>=dev-libs/libcroco-0.6.8:0.6
-	>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-3.14
-	>=gnome-base/gnome-keyring-3.3.90
-	gnome-base/libgnome-keyring
-	>=gnome-extra/evolution-data-server-3.5.3:=
-	>=media-libs/gstreamer-0.11.92:1.0
-	>=net-im/telepathy-logger-0.2.4[introspection]
-	>=net-libs/telepathy-glib-0.19[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	>=x11-libs/libXfixes-5.0
-	x11-libs/libXtst
-	>=x11-wm/mutter-3.14.3[introspection]
-	<x11-wm/mutter-3.15
-	>=x11-libs/startup-notification-0.11
-
-	${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-
-	dev-libs/dbus-glib
-	dev-libs/libxml2:2
-	gnome-base/librsvg
-	media-libs/libcanberra[gtk3]
-	media-libs/mesa
-	>=media-sound/pulseaudio-2
-	>=net-libs/libsoup-2.40:2.4[introspection]
-	x11-libs/libX11
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/pango[introspection]
-	x11-apps/mesa-progs
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
-	networkmanager? (
-		app-crypt/libsecret
-		>=gnome-extra/nm-applet-0.9.8
-		>=net-misc/networkmanager-0.9.8[introspection] )
-"
-# Runtime-only deps are probably incomplete and approximate.
-# Introspection deps generated using:
-#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
-# Each block:
-# 1. Pull in polkit-0.101 for pretty authorization dialogs
-# 2. Introspection stuff needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. Systemd needed for suspending support
-# 6. xdg-utils needed for xdg-open, used by extension tool
-# 7. gnome-icon-theme-symbolic and dejavu font neeed for various icons & arrows
-# 8. IBus is needed for i18n integration
-# 9. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c
-RDEPEND="${COMMON_DEPEND}
-	>=sys-auth/polkit-0.101[introspection]
-
-	>=app-accessibility/caribou-0.4.8
-	media-libs/cogl[introspection]
-	>=sys-apps/accountsservice-0.6.14[introspection]
-	>=sys-power/upower-0.99[introspection]
-
-	>=gnome-base/gnome-session-2.91.91
-	>=gnome-base/gnome-settings-daemon-3.8.3
-
-	!openrc-force? ( >=sys-apps/systemd-31 )
-
-	x11-misc/xdg-utils
-
-	media-fonts/dejavu
-	x11-themes/gnome-icon-theme-symbolic
-
-	i18n? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] )
-	networkmanager? (
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-"
-# avoid circular dependency, see bug #546134
-PDEPEND="
-	>=gnome-base/gdm-3.5[introspection]
-	>=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-am-1.17
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	virtual/pkgconfig
-	!!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-src_prepare() {
-	# Change favorites defaults, bug #479918
-	epatch "${FILESDIR}"/${PN}-3.14.0-defaults.patch
-
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}"/${PN}-3.12-bluetooth-flag.patch
-
-	# Fix silent bluetooth linking failure with ld.gold, bug #503952
-	# https://bugzilla.gnome.org/show_bug.cgi?id=726435
-	epatch "${FILESDIR}"/${PN}-3.14.0-bluetooth-gold.patch
-
-	epatch_user
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Do not error out on warnings
-	gnome2_src_configure \
-		--enable-browser-plugin \
-		--enable-man \
-		$(use_enable !openrc-force systemd) \
-		$(use_with bluetooth) \
-		$(use_enable networkmanager) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
-}
-
-src_install() {
-	gnome2_src_install
-	python_replicate_script "${ED}/usr/bin/gnome-shell-extension-tool"
-	python_replicate_script "${ED}/usr/bin/gnome-shell-perf-tool"
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	# Future-proof for >=spidermonkey-1.8.7 following polkit's example
-	if has_version '<dev-lang/spidermonkey-1.8.7'; then
-		pax-mark mr "${ED}usr/bin/gnome-shell"
-	elif has_version '>=dev-lang/spidermonkey-1.8.7[jit]'; then
-		pax-mark m "${ED}usr/bin/gnome-shell"
-	fi
-	# Required for gnome-shell on hardened/PaX #457146 and #457194
-	# PaX EMUTRAMP need to be on
-	if has_version '>=dev-libs/libffi-3.0.13[pax_kernel]'; then
-		pax-mark E "${ED}usr/bin/gnome-shell"
-	fi
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<x11-drivers/ati-drivers-12"; then
-		ewarn "GNOME Shell has been reported to show graphical corruption under"
-		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to open-source"
-		ewarn "drivers."
-	fi
-
-	if has_version "media-libs/mesa[video_cards_radeon]" ||
-	   has_version "media-libs/mesa[video_cards_r300]" ||
-	   has_version "media-libs/mesa[video_cards_r600]"; then
-		elog "GNOME Shell is unstable under classic-mode r300/r600 mesa drivers."
-		elog "Make sure that gallium architecture for r300 and r600 drivers is"
-		elog "selected using 'eselect mesa'."
-		if ! has_version "media-libs/mesa[gallium]"; then
-			ewarn "You will need to emerge media-libs/mesa with USE=gallium."
-		fi
-	fi
-
-	if ! has_version "media-libs/mesa[llvm]"; then
-		elog "llvmpipe is used as fallback when no 3D acceleration"
-		elog "is available. You will need to enable llvm USE for"
-		elog "media-libs/mesa."
-	fi
-
-	if ! systemd_is_booted; then
-		ewarn "${PN} needs Systemd to be *running* for working"
-		ewarn "properly. Please follow this guide to migrate:"
-		ewarn "http://wiki.gentoo.org/wiki/Systemd"
-	fi
-
-	if use openrc-force; then
-		ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement,"
-		ewarn "this can lead to unexpected problems and is not supported neither by"
-		ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem,"
-		ewarn "you will need to disable this USE flag system wide and retest before"
-		ewarn "opening any bug report."
-	fi
-}
diff --git a/gnome-base/gnome/gnome-3.16.0.ebuild b/gnome-base/gnome/gnome-3.16.0.ebuild
index 349555058e67..919ca5b41ee5 100644
--- a/gnome-base/gnome/gnome-3.16.0.ebuild
+++ b/gnome-base/gnome/gnome-3.16.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/gnome-base/gnome/gnome-3.16.0.ebuild,v 1.1 2015/06/09 23:13:19 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome/gnome-3.16.0.ebuild,v 1.2 2015/06/28 10:46:50 pacho Exp $
 
 EAPI="5"
 
@@ -45,3 +45,9 @@ RDEPEND="
 DEPEND=""
 
 PDEPEND=">=gnome-base/gvfs-1.24[udisks]"
+
+pkg_postinst() {
+	# Remember people where to find our project information
+	elog "Please remember to look at https://wiki.gentoo.org/wiki/Project:GNOME"
+	elog "for information about the project and documentation."
+}
diff --git a/gnome-extra/activity-log-manager/activity-log-manager-0.9.7.ebuild b/gnome-extra/activity-log-manager/activity-log-manager-0.9.7.ebuild
index c3a9a9af2a82..672e84ad6f7d 100644
--- a/gnome-extra/activity-log-manager/activity-log-manager-0.9.7.ebuild
+++ b/gnome-extra/activity-log-manager/activity-log-manager-0.9.7.ebuild
@@ -1,12 +1,12 @@
-# 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/gnome-extra/activity-log-manager/activity-log-manager-0.9.7.ebuild,v 1.5 2014/11/12 21:20:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/activity-log-manager/activity-log-manager-0.9.7.ebuild,v 1.6 2015/06/27 11:31:33 pacho Exp $
 
 EAPI=5
 
 GNOME2_LA_PUNT="yes"
-VALA_MIN_API_VERSION="0.10"
-VALA_MAX_API_VERSIOn="0.22" # build fails with vala-0.24
+VALA_MIN_API_VERSION="0.26" # Fails with 0.24, but works with 0.26 and older versions
+VALA_MAX_API_VERSION="0.26" # build fails with vala-0.28
 WANT_AUTOMAKE=1.13
 
 inherit autotools eutils gnome2 vala versionator
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.15.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.15.ebuild
index 2ae4a27c4039..b5bfdeb74711 100644
--- a/gnome-extra/zeitgeist/zeitgeist-0.9.15.ebuild
+++ b/gnome-extra/zeitgeist/zeitgeist-0.9.15.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/gnome-extra/zeitgeist/zeitgeist-0.9.15.ebuild,v 1.2 2015/04/02 18:46:11 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zeitgeist/zeitgeist-0.9.15.ebuild,v 1.4 2015/06/28 10:47:38 zlogene Exp $
 
 EAPI=5
 AUTOTOOLS_AUTORECONF=true
@@ -18,7 +18,7 @@ SRC_URI="http://launchpad.net/zeitgeist/${DIR_PV}/${PV}/+download/${P}.tar.xz
 
 LICENSE="LGPL-2+ LGPL-3+ GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+datahub downloads-monitor extensions +fts icu introspection nls plugins sql-debug telepathy"
 
 REQUIRED_USE="
diff --git a/gnome-extra/zenity/Manifest b/gnome-extra/zenity/Manifest
index a8867484c434..0e9d65ca90b4 100644
--- a/gnome-extra/zenity/Manifest
+++ b/gnome-extra/zenity/Manifest
@@ -1,2 +1,2 @@
 DIST zenity-3.14.0.tar.xz 3686756 SHA256 6b57ec6c456af17714dc366e63dabb8bbe0577878b61907805f0186d4d2b892f SHA512 2cb6a0649f5fc6eb6f5ebfbdc4eb6feee4fdc06849783bd8b4879a073a13451ec41a8633c086bde6c8b68afe649f7da0ca65581f263507a2b05708af752d48d8 WHIRLPOOL c14c7d38bb4fc2dbcf0e304170a736f7ff4cefe5ef9f7f8512744cdfe6c1896c4c1e7ff0bae7d529f5050d8081fe86f9ec7e95d54471f32252b36ef6c081984c
-DIST zenity-3.16.2.tar.xz 3865640 SHA256 4d38d969a976e5ad79209fbea6dce9222f4478098199a2c52c3e46b1393ea844 SHA512 edcb15634c3f85f5bbdcf6ac5512823ae22dd963797ce7afdf6368b8ad9f5b5ea981228a6b7067aae52e56c38fd625b2c9edb2e5928957562a8ece63436a2a8e WHIRLPOOL d53ff10914b130cd941edc36a0a1242fdfd2cda35985ab2a3c5b76aeebfb950069d57484b9c1b3b262aa618d5807cd7f7e199145dda3735c8062d159645931ac
+DIST zenity-3.16.3.tar.xz 3878596 SHA256 7fe28016fbc5b1fc6d8f730d8eabd5ae2d8b7d67c8bfa0270811ff0c2bfb1eba SHA512 67da24e56b529fda5c9163cd2d2e68a74cf45434ced929da2ca52909bfcdf264d6e9394947c0a129e0ace08e472765d7bedbbfdfab78b10fe69d78c237d45caa WHIRLPOOL 34ba92009792095c51ab5d81e617e0924bd6e06a49bf1681508512de5ca5649e192f8e4c9d13c132188bfa5414aeefeac0215ddc4a4ec6ccc218b6e0139b22d1
diff --git a/gnome-extra/zenity/metadata.xml b/gnome-extra/zenity/metadata.xml
index dad9001338dc..da6fd63d0085 100644
--- a/gnome-extra/zenity/metadata.xml
+++ b/gnome-extra/zenity/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
+<herd>gnome</herd>
 </pkgmetadata>
diff --git a/gnome-extra/zenity/zenity-3.16.2.ebuild b/gnome-extra/zenity/zenity-3.16.3.ebuild
similarity index 85%
rename from gnome-extra/zenity/zenity-3.16.2.ebuild
rename to gnome-extra/zenity/zenity-3.16.3.ebuild
index 8a10cb70972c..24b53733562a 100644
--- a/gnome-extra/zenity/zenity-3.16.2.ebuild
+++ b/gnome-extra/zenity/zenity-3.16.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/gnome-extra/zenity/zenity-3.16.2.ebuild,v 1.1 2015/06/09 14:30:39 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/zenity/zenity-3.16.3.ebuild,v 1.2 2015/06/28 10:11:20 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -22,9 +22,10 @@ RDEPEND="
 	x11-libs/libX11
 	x11-libs/pango
 	libnotify? ( >=x11-libs/libnotify-0.6.1:= )
-	webkit? ( >=net-libs/webkit-gtk-1.4.0:3 )
+	webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
 "
 DEPEND="${RDEPEND}
+	dev-util/itstool
 	>=sys-devel/gettext-0.19.4
 	virtual/pkgconfig
 	test? ( app-text/yelp-tools )
@@ -38,11 +39,12 @@ src_configure() {
 	gnome2_src_configure \
 		$(use_enable libnotify) \
 		$(use_enable webkit webkitgtk) \
-		PERL=$(type -P false) \
-		ITSTOOL=$(type -P true)
+		PERL=$(type -P false)
 }
 
 src_install() {
 	gnome2_src_install
+
+	# Not really needed and prevent us from needing perl
 	rm "${ED}/usr/bin/gdialog" || die "rm gdialog failed!"
 }
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index 7ed0bbda543c..c26a238f0c03 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,2 +1 @@
-DIST attica-5.10.0.tar.xz 60388 SHA256 4518d588902e45c6ddef5d5a383cf0ce4a298a07366ccf55637adebd4058b5c6 SHA512 b72dab658893318b7a0c13f6966b6981ff41285d5350986896dfe410ed7613816c158226c49c37cf48018b53d53db6cf5fba338205ee6241bafc47a690cfdada WHIRLPOOL 7e75a2892eed110986dac3fd510cb9fefc178a51d4797c009526aaa885540d88f71e640e66ea9ac67e99bf8186b68b415cfdd4f0a5773b4adf2155533301169c
 DIST attica-5.11.0.tar.xz 60452 SHA256 1df6a2fd762c4bdc547950f529272d347a0b2f017d10ecf387cb6655f1ef2da5 SHA512 1732e9c80789a926bbec776d693a2cc7eb5ab5ec2a6b903939c0d1d34c3259192be9795b18e297d2f5cb1ed8f9e5f2960b7e89ef15aa2c59bc38e094d2ce0608 WHIRLPOOL 926c2d861bffa6e249ee1c8e4d890be2fa00cd31ad86a20b4ca52c6da73ec0081fb1a61f783d2ea746629197f71a48979068c512ba460f3efa03f73bdd733824
diff --git a/kde-frameworks/attica/attica-5.10.0.ebuild b/kde-frameworks/attica/attica-5.10.0.ebuild
deleted file mode 100644
index 3509fbc2e9c1..000000000000
--- a/kde-frameworks/attica/attica-5.10.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/attica/attica-5.10.0.ebuild,v 1.1 2015/05/09 10:36:07 mrueg Exp $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework providing access to Open Collaboration Services"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtnetwork:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index e4cef83655f3..e6d33c632600 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,2 +1 @@
-DIST extra-cmake-modules-5.10.0.tar.xz 130184 SHA256 062dbc27ea75f5704859a83511721eafbee66b23617fa635d55c22da6b150602 SHA512 e0edd1facfa2a691ff3aa04863a4e571cec0eae07d675e17d2b21e663a6dcb95aacdd232beba04838398c40b0f46e369adf123b657897ff62805c05e9103b170 WHIRLPOOL 59f82344db5e926c763c8e4f3570e0a1ff01720a924d3b0a6699eacca0117845d01d92d2bbd5c80c1e41cbb15ab9869faa12b40b06d3769e9d117d551ccd30d8
 DIST extra-cmake-modules-5.11.0.tar.xz 132200 SHA256 9ee39c08ca4a6066e9c7061b740ed8b1d5f289e6b19a568d1704585d883cb718 SHA512 ae243f8ab2ab12899dc93793e69ac8056d42798de27021e7c6be47ce0a345b1971eed4b4eee24d00c2e1d328c60d032f5cb046bd5a5c2ab76a564ae69d9bde23 WHIRLPOOL 6c4f9a280a43ca18a07a5557accd958418e975335bbac4a712d23e3d8ce7d61264d68ef53aedda98ac812b6b38b9deb582e7b11982b583a529221ada9de76aa5
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.10.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.10.0.ebuild
deleted file mode 100644
index 89e062b6395b..000000000000
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.10.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.10.0.ebuild,v 1.1 2015/05/09 10:36:06 mrueg Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-inherit kde5 python-any-r1
-
-DESCRIPTION="Extra modules and scripts for CMake"
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/extra-cmake-modules"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="doc"
-
-DEPEND="
-	>=dev-util/cmake-2.8.12
-	doc? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-	)
-"
-
-python_check_deps() {
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_build doc HTML_DOCS)
-		$(cmake-utils_use_build doc MAN_DOCS)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 57fe00ddc883..fc636086644e 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,2 +1 @@
-DIST frameworkintegration-5.10.0.tar.xz 1778424 SHA256 c354ecd309b30a0789a67583fef6a09bef5e3070159f817d9336853bb754f402 SHA512 cff1874ef22640eea7f84727f333c683d541be9b9be3c01c2655043ffea26e5f7fd682846eed58fc9855a4763acad93e98b58992b94c7ddae2ade5e4994907e0 WHIRLPOOL e52f7af193c94eaaa4d029217034a8bc12b4c5dc53c89e73fc4e5fb92b677e134fd22c75427af0b0c19798bc708623cc6544111b3afb9aaa37a0c90c0c751e5c
 DIST frameworkintegration-5.11.0.tar.xz 1780460 SHA256 cc69702ad4b51008c9b5558dba57760175d0913b940c3780b696e5763f57c285 SHA512 e836d28f8e10de3c57b974629d0771597371c5ec197513e3dbd05c247bd6be59cabd0a980645dd30f4999f1264d02e0e823b32f6cb4eb02abe6302ee24edfa8e WHIRLPOOL f20990bea03620cfe1387a44365f516e5b300af23db72546c94efa4e5b0ff8e1aee8a46bf4b0c016a270c377490db54d09488c537c39821d7c0db2b5d17ce5c6
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.10.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.10.0.ebuild
deleted file mode 100644
index 588d21dedf3f..000000000000
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.10.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/frameworkintegration/frameworkintegration-5.10.0.ebuild,v 1.1 2015/05/09 10:36:06 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for integrating Qt applications with KDE workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="
-	$(add_plasma_dep oxygen-fonts)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	X? (
-		dev-qt/qtx11extras:5
-		x11-libs/libxcb
-		x11-libs/libXcursor
-	)
-"
-DEPEND="${RDEPEND}"
-
-# requires running kde environment
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X XCB)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kactivities/Manifest b/kde-frameworks/kactivities/Manifest
index befd6b2db331..0adc393945c1 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,2 +1 @@
-DIST kactivities-5.10.0.tar.xz 144580 SHA256 534b79658d0cbb58e599ea2dadc9fe364c8279ac2895ab536a9f2c98b6f44c34 SHA512 06a5b7f830e47c67a1b332be474e52ab23e2f86d145e9d28eb30e76379b196d298d73c6ac1b3eb890e546770bd99edb8d8aa67990af4bfee75460f1b0e6745b4 WHIRLPOOL d08e5c7e420aa851683b19412a95b8041d3f83520ecb60a9e65f35262034be1464d37b154ea183f80d63d3a5c01ad538e8715e6988ecbf3307b9735fb06c9e04
 DIST kactivities-5.11.0.tar.xz 165044 SHA256 f8576bd7b0a63d5e745441eef3157751e13c04adcd398ff4daa936f12c5c8726 SHA512 967e87c2b5ab0ad7424a1dd8699c14170e920b1204d81303a0ae982c60d40b17bce2f34862dd1f7daaf0ff53009a1f1e974973bba526a93f409e55f95188bee9 WHIRLPOOL 18199427fc720d87f2b5f985581103d65241b2eb4a312ee60507fe503d33662370c1bc70be3cd3d4d04aeb6f9d828e9d1a590429dc55ff2e8ba4eb7599b7fc68
diff --git a/kde-frameworks/kactivities/kactivities-5.10.0.ebuild b/kde-frameworks/kactivities/kactivities-5.10.0.ebuild
deleted file mode 100644
index 293ff2bcf88d..000000000000
--- a/kde-frameworks/kactivities/kactivities-5.10.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kactivities/kactivities-5.10.0.ebuild,v 1.1 2015/05/09 10:36:06 mrueg Exp $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework for working with KDE activities"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	!kde-base/kactivities:4[-minimal(-)]
-"
-DEPEND="${RDEPEND}
-	|| ( >=dev-libs/boost-1.54 <dev-libs/boost-1.53 )
-"
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index 9ac635f580e0..23b6f986b1c6 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,2 +1 @@
-DIST kapidox-5.10.0.tar.xz 130124 SHA256 64abb5edada99e4719acd314cd236c406dd620d306d2311062dcba1d4a9252fe SHA512 2f91c68d5e28dfda892fd55a50b1e3bfc0d1d1d862ea3a1508349b1233b3bfeb8beed4436fee48b95cb9f9a9db80cf38df6410f39aa1c52a6d236a072fc16170 WHIRLPOOL 734c25f0741bef0f9633bb91038aeebe8b6c90c5defc87ef99343395b59382fa3bb7b099ab7da9e1107a2476ba5d478d4cae233f9d3ba34ac72151422b9b5460
 DIST kapidox-5.11.0.tar.xz 130108 SHA256 78103292d556b1711e8e8aad37891694eb8c1b6bcc5fece2cc304c51a2d0b3ec SHA512 91693b9bb88fb24c415fcc89997f7030a943fc9f507d3af3e3e7b1a1f29d4daff76c41d2918741de20120ff7ff2e199def4af2063c9a0f38bb3184a1ae7bafe7 WHIRLPOOL 2123e3a60ab4b47dfd0f3ff8e456338f07f789c5b3fbd10036b5da046593a0409b564b3b1d41381fa344a9b92304b5e63d4afd520ae692aea9bb3615c44b2ccc
diff --git a/kde-frameworks/kapidox/kapidox-5.10.0.ebuild b/kde-frameworks/kapidox/kapidox-5.10.0.ebuild
deleted file mode 100644
index a197fefaef48..000000000000
--- a/kde-frameworks/kapidox/kapidox-5.10.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kapidox/kapidox-5.10.0.ebuild,v 1.1 2015/05/09 10:36:05 mrueg Exp $
-
-EAPI=5
-
-KDE_DEBUG="false"
-KDE_DOXYGEN="false"
-KDE_TEST="false"
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit kde5 distutils-r1
-
-DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
-LICENSE="BSD-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	app-doc/doxygen
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	media-gfx/graphviz[python]
-"
-# graphviz is currently python-single-r1 so we can't enforce a USE dep yet
-# and things will break if you try to generate a dependency diagram with a
-# different python version
diff --git a/kde-frameworks/karchive/Manifest b/kde-frameworks/karchive/Manifest
index 61b4235289fd..335e027d2cc5 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,2 +1 @@
-DIST karchive-5.10.0.tar.xz 108412 SHA256 dcf173927b3b8ccbb5144f4385e7e70717eb2c081d835e132d89ef135dd89fa6 SHA512 e8ff223fb18ff7a730c3f2c1cb9cd41caaaaf0d5aedc374c0befe86ba896f17eb846f109d964b26c755f30742af7b7453b6f2967b2f76df9a8effbd65dd75ed1 WHIRLPOOL ae39fea779f6cd6b38f92fbc15ae7cd3d0879850ace0cf48d7808668c7f2f737ff4ddd45c91e82bc37e63764d21e1644864b9513872888c95ac114c5a6875bf7
 DIST karchive-5.11.0.tar.xz 108552 SHA256 d5c03d5565bbbecd878349307c7cf56fe57eea7bcf95f0b7f9e9181e0a1f147e SHA512 2c36119adf041c689d473ee15f5a3af7f9d889c1f28238290384d82b446fa247a90b5a91aa99ddabafde50a10d02c735b6431928a703e5d7071285b7264dbe19 WHIRLPOOL 1fa91a89af41190b636431064fe7bc81aeffb096129193bb183a33b3ee959aa106b6a7b9569dabea6d48a13c7ea341eb350684cb8b9c3bf7d303b945aa5eab75
diff --git a/kde-frameworks/karchive/karchive-5.10.0.ebuild b/kde-frameworks/karchive/karchive-5.10.0.ebuild
deleted file mode 100644
index bc932d66cdb7..000000000000
--- a/kde-frameworks/karchive/karchive-5.10.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/karchive/karchive-5.10.0.ebuild,v 1.1 2015/05/09 10:36:06 mrueg Exp $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework for easy reading, creation, and manipulation of various archive formats"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="+bzip2 +lzma"
-
-RDEPEND="
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package bzip2 BZip2)
-		$(cmake-utils_use_find_package lzma LibLZMA)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kauth/Manifest b/kde-frameworks/kauth/Manifest
index 921cf4687d8c..d564ad6ef16a 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,2 +1 @@
-DIST kauth-5.10.0.tar.xz 81476 SHA256 98f64842060eb5aad5c4f468a631cd8d5c118cf34b476a1c6809daf931c89d1c SHA512 638f9ad482a57b9ba57b1e542027a1ed4213f6b3c8cd1ac11628dc98743ba9fe9c47abe548aefbd9d1859189f9e1681d2be5928b672f1dd37c1968880d10f9ff WHIRLPOOL abb235dd5afa12ed3be4c5703a057a3a1e4393dc807529917c413726957f4622626a05dfab8c40a811a72630967a48fd07e269dbc73813e931283c2b787eb78c
 DIST kauth-5.11.0.tar.xz 81932 SHA256 d04e217898e303f10589ea87317795c0b66fa5fa76fbe79e56f401978bc9afcb SHA512 8b0d8ed6c9d7eab81214d189639119218002c7bd1bb754d7826b7e52e51384861488afa12e1d0213203af8c7d1104782dd457c268759d18a7cbb25c2cdadf151 WHIRLPOOL db91b1392b3d9b14690632de98be61303924c5a185ab5b1e6d8395ed5a0b37fc2874b44d35f20458ddd61ed4f833d65a9a796093aa312bd16ce663dfaf2e6254
diff --git a/kde-frameworks/kauth/kauth-5.10.0.ebuild b/kde-frameworks/kauth/kauth-5.10.0.ebuild
deleted file mode 100644
index f0e6a9a4725f..000000000000
--- a/kde-frameworks/kauth/kauth-5.10.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kauth/kauth-5.10.0.ebuild,v 1.1 2015/05/09 10:36:05 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework to let applications perform actions as a privileged user"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls +policykit"
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	policykit? ( sys-auth/polkit-qt[qt5] )
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-"
-#PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package policykit PolkitQt-1)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 97860242b5d9..595d4f8d9d6c 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,2 +1 @@
-DIST kbookmarks-5.10.0.tar.xz 114820 SHA256 bcf9b522fb2a906fbf83d23b0ed85d9ab541f68344600d6bd5a70c8b762f1610 SHA512 b95ea67fcf534c8b39e68ad85e3779f228ba9e8b73b99a08c909aa0aa11d7a5203d8823143696d56a107be21236da2b96a52de91b78d88c2ddd83490a558c08d WHIRLPOOL bdef2e7c372137f49510eb1c155177124a2123dab6ba790cdbd53040c67850e6d25feb786896831c032dffdd323f3951f916b08961b39ccaf974a85997535631
 DIST kbookmarks-5.11.0.tar.xz 114716 SHA256 fdae0ca3d9e2617b1d4c318a0fef586ad7147db630fef68cbb2b061c138f1b22 SHA512 38fd3b918e600b9f10eb0ca741f8faac36d1807fe2d3f6aab578c38e9262f1ed48f6436ff58bd0f5eece455670125553870116f2e1cb9bd4bae6c5b341f2eb05 WHIRLPOOL 4eecf3d76e5b7db87699869e3479169e4fbcad894060546abc4597c378ff3605629d65ac6fccd177ed7ec57e2fdcbe28bee8c294a36b9577ce29842b0601e42d
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.10.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.10.0.ebuild
deleted file mode 100644
index 3936203938dd..000000000000
--- a/kde-frameworks/kbookmarks/kbookmarks-5.10.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kbookmarks/kbookmarks-5.10.0.ebuild,v 1.1 2015/05/09 10:36:06 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for managing bookmarks stored in XBEL format"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kconfigwidgets)
-	nls? ( dev-qt/linguist-tools:5 )
-"
diff --git a/kde-frameworks/kcmutils/Manifest b/kde-frameworks/kcmutils/Manifest
index e3a1cc0660fd..cc822595e641 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,2 +1 @@
-DIST kcmutils-5.10.0.tar.xz 234680 SHA256 3df7f0a296fd86671a60205405f62c7cc43afac8642b8970f4b3f269ed9225a5 SHA512 e3aaccf85ee95f138af5b5e58932b8b9d087ca46fb22efd4b874ec0a73b3216a1fa759ee4ad46b0fb5b11a1ac7aa7f088c1fa1429ac633373f33ee02aa824f68 WHIRLPOOL a5a186bbb2cdaa3c155645772d46ff667f74d5cc40bf681e2e502522d32aae14fa338e53471cbf657c959390d8e37ede7dca58fd4833b6541cb79337b945620c
 DIST kcmutils-5.11.0.tar.xz 234792 SHA256 da973b27b731d563704992ced206eda75f148c59422743bbe84f82d5e7ad0d49 SHA512 c09f16653b92e50c28b05f1874d4753effed3269f4dc806a0910384d02e63b14b637a7710ed3d84ba06e69e66a9640890a4b0837817e2c9f06f64d8df329cf7a WHIRLPOOL b19cd8e0523c1d6b7d164f2c63fd8d714d7eba54dd41a7049afeff64835226a7894dcca76fc03421560807b48e0a9feecfa237db1c8923bb3c297333fa2beb49
diff --git a/kde-frameworks/kcmutils/kcmutils-5.10.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.10.0.ebuild
deleted file mode 100644
index e56922e2a60c..000000000000
--- a/kde-frameworks/kcmutils/kcmutils-5.10.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kcmutils/kcmutils-5.10.0.ebuild,v 1.1 2015/05/09 10:36:04 mrueg Exp $
-
-EAPI=5
-
-FRAMEWORK_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework to work with KDE System Settings modules"
-LICENSE="LGPL-2"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kcodecs/Manifest b/kde-frameworks/kcodecs/Manifest
index 9b8161822d2e..e2dad1b52263 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,2 +1 @@
-DIST kcodecs-5.10.0.tar.xz 223216 SHA256 2cf22755fdb6b310bd46adeb6bfd2b2a8e3daa80d865ac0cb51cf6bb6f36fcc7 SHA512 26c8e5218a6949d662e8060386688deb475a96f7ab55cb1e82adf632b175b1dc7a125e086374f2bcad4c5ceee4f828d225181c9d57e6c0dfa9ccbf47b6700d75 WHIRLPOOL 09ddead3e66963c0a5e6f200162483330bf618e426dc1423509e253d41e05f497a09e90444b9a04e848371fa73c4f879c800643666c0399a1615ca143ce9d88a
 DIST kcodecs-5.11.0.tar.xz 224024 SHA256 6bab485c7bdabdec53a717a5ba4b2400c39d6b80a31741ea00bc3ae58436c0f7 SHA512 2082cd568938e66b2cbad298aa510987f9b4219e3f2d59471ed42ce3053627ed9ee39ae20692aa393f3d676df2aec91dbe3e24a16a65330352f024fbffd05a48 WHIRLPOOL b51022ccb5bcdc2783115164946c76e5af97b211081b7512d95aca21e06767df916726de185fe51dcc8fbb82e6ed064653be5342744809faa282875f6cca8de6
diff --git a/kde-frameworks/kcodecs/kcodecs-5.10.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.10.0.ebuild
deleted file mode 100644
index 231aa089888f..000000000000
--- a/kde-frameworks/kcodecs/kcodecs-5.10.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kcodecs/kcodecs-5.10.0.ebuild,v 1.1 2015/05/09 10:36:04 mrueg Exp $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework for manipulating strings using various encodings"
-LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-DEPEND="nls? ( dev-qt/linguist-tools:5 )"
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index 81671b2b0a78..c87406bbbdd0 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,2 +1 @@
-DIST kcompletion-5.10.0.tar.xz 115760 SHA256 f5e06df67fdecb040d3c96521a0ffdb2c079a9d08bf5321e7ceb1819f15968b1 SHA512 5d898cb8eb874961e56527cb1f435ade9ef541ae9f1000e0fc270fd87b1a933cc485d97d133233e948bc4f040c60587a0d2ac642fe8b1eb4104534fd4a36b188 WHIRLPOOL 79c82c0442efecd06f96b6badda0d6867a53cf534a63a7d5f1e824b48fd061320a6e66cf62ba2d964a9b59bf978c691090c001d1785db0280da01c77b30b4efa
 DIST kcompletion-5.11.0.tar.xz 115784 SHA256 a2d602ff6ce8689a1e3f115ef47df910c431cb443eda9dfbbe7cd179c5d6767e SHA512 2408ecefe25153477d73adb08e652ded8e095059c989d41e1a33ffa3ceeec2ac67483d290bbc97b117d8f4142464e7186d7b47fbfe583a9ce61002d3e0db3d7e WHIRLPOOL 08d5bca6f9237cf31ae913e3fa8b828f1ac1d230123ede7053647b945d467cfdf30d94dd34d8d9c70915b026b97c9a967ed2015c608393b7fcee68eb18490af1
diff --git a/kde-frameworks/kcompletion/kcompletion-5.10.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.10.0.ebuild
deleted file mode 100644
index 1f3d1fbcb17d..000000000000
--- a/kde-frameworks/kcompletion/kcompletion-5.10.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kcompletion/kcompletion-5.10.0.ebuild,v 1.1 2015/05/09 10:36:08 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for common completion tasks such as filename or URL completion"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kwidgetsaddons)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-"
diff --git a/kde-frameworks/kconfig/Manifest b/kde-frameworks/kconfig/Manifest
index 45f7364cb2c1..4d718436fd86 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,2 +1 @@
-DIST kconfig-5.10.0.tar.xz 218268 SHA256 b8a5d362552bc0f8dfb31bf9bc5ea5eccc9e20c202579c68028d5a0aa327f9e4 SHA512 47125141acb092b4b8638066776fc5b93593dc889e7bb48b793aa1ab2d28ba31d65476636f4b1067dc52718cb16fdde698495ce85e710c67d0c8475338e4c428 WHIRLPOOL 6f85c22da795460309fcaca2428076b719d2bf1df4c86873d2db61f5e949081b96c7a75497dd29791b4341cc04ce23ba4567de6f82ecbcfe535bb1943600089e
 DIST kconfig-5.11.0.tar.xz 218872 SHA256 3cd834330ef2aed786ae3d08dcaa2479cfd7b6d542153a142d356697770a9834 SHA512 bc5b5f9a581b1ed443e1fa0bbb364be6c205ca4e67aaa93e47572fe232165a8fe6dfebf2395687886adf8146cdbc79023801c08d86e51485ccb1ed9abc0390a2 WHIRLPOOL 013eef7ea433640c4cc2cce96f87af3f9b33b7c6c7aaa2e5f15be35d62b615fcc7c7a1340a95bc7dea1d6360e0b7e414068d238ccba92f17eb50bd9a4f6dc31b
diff --git a/kde-frameworks/kconfig/kconfig-5.10.0.ebuild b/kde-frameworks/kconfig/kconfig-5.10.0.ebuild
deleted file mode 100644
index 93715ca4fadb..000000000000
--- a/kde-frameworks/kconfig/kconfig-5.10.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kconfig/kconfig-5.10.0.ebuild,v 1.1 2015/05/09 10:36:07 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for reading and writing configuration"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-	test? ( dev-qt/qtconcurrent:5 )
-"
-
-DOCS=( DESIGN docs/DESIGN.kconfig docs/options.md )
diff --git a/kde-frameworks/kconfigwidgets/Manifest b/kde-frameworks/kconfigwidgets/Manifest
index 54e714aa108d..94f3ae17d5cb 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,2 +1 @@
-DIST kconfigwidgets-5.10.0.tar.xz 358512 SHA256 209ef3b01c7e2c91aacb84dfc838f73f5ada8c4e254d5c9085a6eefbdd38e0a6 SHA512 5416fa8ce7fb0be189932bb82d2ebb8a2732a6139a91d01f1f1718b9aa46d242541cbcc4e796a96a9e6ff9942d9cbdcf76d8ea8bb80d89435ef03eed78efc2ed WHIRLPOOL 0c3302ae92c3cf8c7b8a301b3c22ba010d2b6d1962e23625d35bb23e632c13cee00a48fbe5d7fb2ab9b8944e934f13ba4ff590e41ac12c8510024a51e20fa66b
 DIST kconfigwidgets-5.11.0.tar.xz 358600 SHA256 8dfadb445da5622f6e85a43db2b7cd2515b9d2bb1b0ce6f9c4cf277f440270ec SHA512 990d6f6d3fd6d5251c471af81146eef0cd20322bf47b4a2ad05903708ff54d1780b5b7aef63fda4ceba88c5787ffc82877febb4d0822bfcdda64ec96d642e0cf WHIRLPOOL a36c00918aa4e61ae2fa5b6f9a9dacc98268de0591a75d001519303e131c9e0d936260fda02baf3dcc19fee9e1e536111648fb2d85fbc62a5ea3d7987485c9e2
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.10.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.10.0.ebuild
deleted file mode 100644
index 52c617ef43fa..000000000000
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.10.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kconfigwidgets/kconfigwidgets-5.10.0.ebuild,v 1.1 2015/05/09 10:36:07 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing an assortment of configuration-related widgets"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwidgetsaddons)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	!<kde-frameworks/kdelibs4support-5.3.0:5
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-"
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index 9e38e5d92b24..fdaeedf724ec 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,2 +1 @@
-DIST kcoreaddons-5.10.0.tar.xz 301520 SHA256 816dfb6dc6d4c9b5360ee6d473cbff8d3519d0743d5d3b777c209ad615283278 SHA512 c1c6063936badb3a281a3e0c7dfc4b5704e558f9fb1122ffbf463fe022df177d8bb8a4edacc408128c369ac3db2c4a1338fb75d63ed165b10ae58fffa8b327f1 WHIRLPOOL db4ffc42a26a2d9ce93409ad5801fb119ae5784e4e86039168f4aa72e296c293f61d735d726fa69239b31a275cd2a00276dfbd9444bada2923e1fc3b5b0f22a2
 DIST kcoreaddons-5.11.0.tar.xz 301532 SHA256 078fdc149b55461aabc3a610ba466835bbe96340feb8467d4653e174ecfe4744 SHA512 18ca80985c4f763073d63db3c346320bd062777282cac1fde3b298f8f99537db564fa7e517f4c23b74e0b14c0910aa378e3b759f18c2d1235162d16e50d127d3 WHIRLPOOL 4f7f07711cfc3efa976650f74813b0172d71e861a93cdfdd8a15950b39949764505eac76755a568a9cf7d3bfcf438d9c4e6ede6ced89c95fa77d5bcc7757707c
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.10.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.10.0.ebuild
deleted file mode 100644
index 97d25923db87..000000000000
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.10.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kcoreaddons/kcoreaddons-5.10.0.ebuild,v 1.1 2015/05/09 10:36:05 mrueg Exp $
-
-EAPI=5
-
-inherit fdo-mime kde5
-
-DESCRIPTION="Framework for solving common problems such as caching, randomisation, and more"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="fam nls"
-
-RDEPEND="
-	dev-qt/qtcore:5[icu]
-	fam? ( virtual/fam )
-	!<kde-frameworks/kservice-5.2.0:5
-"
-DEPEND="${RDEPEND}
-	x11-misc/shared-mime-info
-	nls? ( dev-qt/linguist-tools:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-D_KDE4_DEFAULT_HOME_POSTFIX=4
-		$(cmake-utils_use_find_package fam FAM)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	kde5_pkg_postinst
-	fdo-mime_mime_database_update
-}
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index f556b6b9a640..b9fa1806389e 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,2 +1 @@
-DIST kcrash-5.10.0.tar.xz 19528 SHA256 9d5a5fcbf59b4e64c39218477f76031e574a8d97b4974b957025688b14b2afc6 SHA512 a7902e80e7a8db3aa26ceb224aa20d859739d8fafc30895ba748def15ff549394f7fe8a84673b17519645de1512dfb3e7f8134e42fdf226c6724ca291d95038e WHIRLPOOL 3e7b1bb9185e6811551e4366683ce3cf9f136134a4299002c268ea655290e7ad3165cb30d9c703ed57001360d31ec69517ba482954bfcff0e559463440dae60b
 DIST kcrash-5.11.0.tar.xz 19596 SHA256 f452faffe8693bd841e717179209d13343447dcb2134257f5930fba9d3818dab SHA512 76631f13c50a0cb2a463a3128115eabeedefafa8f485e3eab5aade008745f3228feddf9169a5335195170c046cd90c3420d58812ce8e47752c3d6b887de9186f WHIRLPOOL c4f823b4b090547f9907aad59812d3142e124b816428f9100adfa68722aa83ac49c8e7fc1daf62427730d8f20895fca573036244cf439e7ee752a2f9b4caa26c
diff --git a/kde-frameworks/kcrash/kcrash-5.10.0.ebuild b/kde-frameworks/kcrash/kcrash-5.10.0.ebuild
deleted file mode 100644
index 724673015b23..000000000000
--- a/kde-frameworks/kcrash/kcrash-5.10.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kcrash/kcrash-5.10.0.ebuild,v 1.1 2015/05/09 10:36:04 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for intercepting and handling application crashes"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls X"
-
-# requires running kde environment
-RESTRICT="test"
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kwindowsystem)
-	dev-qt/qtgui:5
-	X? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-	test? ( dev-qt/qtwidgets:5 )
-	X? ( x11-proto/xproto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 8bba44ec0be3..3bc0c6970a8b 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,2 +1 @@
-DIST kdbusaddons-5.10.0.tar.xz 32884 SHA256 75f4d7fe9db3ee8687e77a3a710c8953b28fc2648dda8bb52a01304a04816752 SHA512 5e33b9cd1517c5e3ed4f8dbc5cee8b33a1403e79390ec277d3d9e55945dc34b9985a75ec131a6cd9a2e3cd8147bb1807304ddd2a2443c14c54f1fe0ea2cbe4bb WHIRLPOOL 8a389e8c68a4b52cb94f13b1ecc62db8c801257bf88583900a1afb1ab789dc5c74ab5a75d18532412abf01bb96916415c047c39049ae295506d7b28c7810aca7
 DIST kdbusaddons-5.11.0.tar.xz 33068 SHA256 48c10e0f3661e31353fc8a7064ed43a49f1d9014720837aca94fac923779a293 SHA512 20ae1d342afcf1c62270819bb2df51444809d690b0617866ec1878abf4fc58734ed9ca41deb63840bb6e3195586652aa2297a4f784364e8d8936b28580c7c27d WHIRLPOOL 08ba0804f8da221c18cb1697391c7471e1cd9236bd8c23716601cc6f1608760edc3365bcbb4149ffa0b4895e6e26666e4b36648b58426d27cf10d660f68b9a55
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.10.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.10.0.ebuild
deleted file mode 100644
index bf349d37d22a..000000000000
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.10.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kdbusaddons/kdbusaddons-5.10.0.ebuild,v 1.1 2015/05/09 10:36:05 mrueg Exp $
-
-EAPI=5
-
-VIRTUALDBUS_TEST="true"
-inherit kde5
-
-DESCRIPTION="Framework for registering services and applications according to freedesktop standards"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls X"
-
-RDEPEND="
-	dev-qt/qtdbus:5
-	X? ( dev-qt/qtx11extras:5 )
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X Qt5X11Extras)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdeclarative/Manifest b/kde-frameworks/kdeclarative/Manifest
index 0042c01d4992..32bae65ae870 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,2 +1 @@
-DIST kdeclarative-5.10.0.tar.xz 158812 SHA256 cfa718c5b86684c106535dff659e3f4a9dc6227becdb90928ec2da38c8c3dacd SHA512 57af6365b9595aa890bb245723a275b89d9ecf8f58290b3cc441c34527569b3f5347cfe6fda6603257a73641ce2ad2087faff48e8eabe1932c09365474ecfe6d WHIRLPOOL 9e34f8eda12956b77458f31a4540800a79dd129d63b5d0f79b359dcb240535cd9e82f3aa2211f330c354ef6267c1284cc2298048532009679a9689a3a2682e16
 DIST kdeclarative-5.11.0.tar.xz 159108 SHA256 d93148c3284d85b31cc79378ba52bbc38aad2a7364a93ecaaf2206b2771c40ea SHA512 80c7ca591e1fe124206bacee792f1bbfd87b83e68db3243dfa01e4b2fb9d85731dc2e7f872359f99a35997811e4b36226e472c6ab15f8263022bd3756d043147 WHIRLPOOL c5da44a0f6e633356edbc0d888f4a8295b4206a6117cc9012104bebe8862dd966f92583734c72d7994f36f0ee83e66e14c520f53392200f50eea9d9adf4c04a0
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.10.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.10.0.ebuild
deleted file mode 100644
index f33f3f214877..000000000000
--- a/kde-frameworks/kdeclarative/kdeclarative-5.10.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kdeclarative/kdeclarative-5.10.0.ebuild,v 1.1 2015/05/09 10:36:07 mrueg Exp $
-
-EAPI=5
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework providing integration of QML and KDE work spaces"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-libs/libepoxy
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kded/Manifest b/kde-frameworks/kded/Manifest
index 0d034d6c1d22..7762e914b526 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,2 +1 @@
-DIST kded-5.10.0.tar.xz 34004 SHA256 8a48e51792852bfb82f6b3160d8590d1e942a87f271982795f2f26204d6a5658 SHA512 32f27e245eb82aaa02b65930d702d58e5f57a556b22e6b6d4fe533aade003d78e4ace8545d2282430607a409ab5b40f6d0501789c22519d118914ab4bb0259d0 WHIRLPOOL 6d989a5a3332c3ae8d692c13cb514d08b9b744490612cf21ffc15115a4ba75b72e846b7960e76fcba51a2956fa67a7c1485bc252e57431c3a3a755c05589e364
 DIST kded-5.11.0.tar.xz 35200 SHA256 59c602185df4ce6d146666052e01b05cdeb0579dd143a82fcbf22647a5ee3370 SHA512 7561565b7a8594a7761a668dd585ac305fd0e1f5256cbe09045f0a72b816a0aaae8625a21c0534d98dacc246163ec8505784c2b13cbc1696e3ab2ce7f2dc0c4e WHIRLPOOL 044aa7bf44958356daf9a4c3836d0b4330a581a0a5c997e4d949b72514c06d4c0d43eda7552d66e4f5285d161afda8e881cec5e0ecec1bd7089a8028950bc70d
diff --git a/kde-frameworks/kded/kded-5.10.0.ebuild b/kde-frameworks/kded/kded-5.10.0.ebuild
deleted file mode 100644
index 6f6b8f7ed6b2..000000000000
--- a/kde-frameworks/kded/kded-5.10.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kded/kded-5.10.0.ebuild,v 1.1 2015/05/09 10:36:07 mrueg Exp $
-
-EAPI=5
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Central daemon of KDE workspaces"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kservice)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-"
diff --git a/kde-frameworks/kdelibs4support/Manifest b/kde-frameworks/kdelibs4support/Manifest
index 6ab03e853a59..d64c30f191d3 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,2 +1 @@
-DIST kdelibs4support-5.10.0.tar.xz 3213988 SHA256 c253e2f7b9f94c9708335990bcf64e7ab1fb6b3bf204b21afbe84f860e80ea48 SHA512 25fbfd7f3996149efd4562baba8644c12c9fb8430cc97efdd06f4e9ee47123be072f7cba835a1d9213880b83194b57d73b940efbba1cebd3283e8cc8f686d394 WHIRLPOOL 05050c18448e7b7a5c1740c3d6ac565e478e160a38e21ecb56c214d093a1c3ec09c2a46c8e0b434d915ec3befaffeaffa8c936c490b992dc6242b0d146a7a9dc
 DIST kdelibs4support-5.11.0.tar.xz 3214656 SHA256 30b6b8e9d3994ac69f38b7a4cbc164bc636a52c6975ecd56c1a376066a93b6ac SHA512 ebdfa55b939db0e45d5e97f17ba9307813027f585569e993758d0ec0ec5febb593de0e09e83595f89816d354aa358884c0132dc7bbdf475cb7caaca9609b89bd WHIRLPOOL 8609f25920f63cf3117089c044918f45b6ea7968f17cae3ee357d49a2e202ad6916fd405bd63b2369e3d4a8f325b8f2480782f2f2e374cba8a717197b6b5894f
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.10.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.10.0.ebuild
deleted file mode 100644
index 939b1fc53534..000000000000
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.10.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kdelibs4support/kdelibs4support-5.10.0.ebuild,v 1.1 2015/05/09 10:36:05 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework easing the development transition from KDE 4 to KF 5"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdesignerplugin)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kunitconversion)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	app-text/docbook-xml-dtd:4.2
-	dev-libs/openssl:0
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtsvg:5
-	dev-qt/qttest:5
-	dev-qt/qtwidgets:5
-	virtual/libintl
-	X? (
-		dev-qt/qtx11extras:5
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kdoctools)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kinit)
-	$(add_frameworks_dep kitemmodels)
-	dev-qt/qtxml:5
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kdoctools)
-	dev-lang/perl
-	dev-perl/URI
-	dev-qt/designer:5
-	test? ( dev-qt/qtconcurrent:5 )
-	X? ( x11-proto/xproto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdesignerplugin/Manifest b/kde-frameworks/kdesignerplugin/Manifest
index fe2f64186665..70d270d70ac4 100644
--- a/kde-frameworks/kdesignerplugin/Manifest
+++ b/kde-frameworks/kdesignerplugin/Manifest
@@ -1,2 +1 @@
-DIST kdesignerplugin-5.10.0.tar.xz 86628 SHA256 f566f69aa3de4097bed4fec0fbd2b82584af2bab874502b386755d586c9f02fd SHA512 ef01d7faf1f412a25fd8af7798b3559df8371f464182dfb0a8872f95ba53b48dbf9d99dbd2a42e7f5d6a803abf378506229e719204d5b3507965eb9acdf21c36 WHIRLPOOL 2b567ea211261df91b58bb1c537dddd1e3be270c4616aeedf9ef8cf192996a429eaa1afa5c8b0f7e653f2e993eaedadf80b8cd07f1cf1dc7f38aa5af995dffc3
 DIST kdesignerplugin-5.11.0.tar.xz 86712 SHA256 46f25a411858f9c3126344a4530bbcf989687de49ecde358aa4f9df6e91af64c SHA512 2ffa91b8e00a9ba4407fc796f92255d2464e3811420d24b15a1c9e4a0e3ca9faa3f9d18230d36cc4487a9ad1fb3d3b73671d68ec7efe9e2d3c478440139720a8 WHIRLPOOL d870bf7884815daefc786845e9a505ba58a05fd9d5e5c29e96106ab36db29eb8288fcd073e15f0de0562f8a22d78d30c6aa8079c34b26341b092e17d876a64d3
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.10.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.10.0.ebuild
deleted file mode 100644
index af7fdaf2a46e..000000000000
--- a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.10.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kdesignerplugin/kdesignerplugin-5.10.0.ebuild,v 1.1 2015/05/09 10:36:04 mrueg Exp $
-
-EAPI=5
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
-LICENSE="LGPL-2.1+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="designer nls webkit"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	designer? (
-		dev-qt/designer:5
-		$(add_frameworks_dep kcompletion)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kiconthemes)
-		$(add_frameworks_dep kio)
-		$(add_frameworks_dep kitemviews)
-		$(add_frameworks_dep kplotting)
-		$(add_frameworks_dep ktextwidgets)
-		$(add_frameworks_dep kwidgetsaddons)
-		$(add_frameworks_dep kxmlgui)
-		$(add_frameworks_dep sonnet)
-	)
-	webkit? (
-		dev-qt/designer:5
-		dev-qt/qtgui:5
-		$(add_frameworks_dep kdewebkit)
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	nls? ( dev-qt/linguist-tools:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package designer KF5IconThemes)
-		$(cmake-utils_use_find_package designer KF5ItemViews)
-		$(cmake-utils_use_find_package designer KF5KIO)
-		$(cmake-utils_use_find_package designer KF5Plotting)
-		$(cmake-utils_use_find_package designer KF5TextWidgets)
-		$(cmake-utils_use_find_package designer KF5WidgetsAddons)
-		$(cmake-utils_use_find_package webkit KF5WebKit)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index 1d5bdf88ce2e..4e56ef63aae8 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,2 +1 @@
-DIST kdesu-5.10.0.tar.xz 43548 SHA256 3cdbb4af0f4d691993aab6eb2aa0260a9fd60fdd0c3ceaaeaa30d0adc5f65900 SHA512 0e502f5015dadd166c75ad128cfa18fe4e367200d67e6feac0d34c88d0dbb056fd082f2f7fa9cc9db1e690bfbcc48f4d013ab765824c7a0dce40ff02ad4ed8b2 WHIRLPOOL a946e058fd03c43d75c44e91f0589873b71e1ebdc287a4b7a10eafb2b7571874f9dc080b83b1f87703887c9dda46301bed2012f17a0b3fbe3eba56b81d59c46c
 DIST kdesu-5.11.0.tar.xz 43612 SHA256 2036107493c51a2bb70eaf77b26318c8276d346d2d78065c0bbbe59c6b40b657 SHA512 7417cef8bb1df5c243c8cdf0cf9d021c4109582b27c0e8ba2c867384a4204ffa15528df97cca781132a0a0af95ad2d0a7600b3222140b34244240ffb3b7d4686 WHIRLPOOL 2c9c80296c63dfb63b899ea771ac87a7ade7018e60f9de274e43becc5136991fda1d6f7dfc49f303b8817fb0e1896d71164842cce63464cb3d026806362bcd0a
diff --git a/kde-frameworks/kdesu/kdesu-5.10.0.ebuild b/kde-frameworks/kdesu/kdesu-5.10.0.ebuild
deleted file mode 100644
index e2425622f3b4..000000000000
--- a/kde-frameworks/kdesu/kdesu-5.10.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kdesu/kdesu-5.10.0.ebuild,v 1.1 2015/05/09 10:36:04 mrueg Exp $
-
-EAPI=5
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework to handle super user actions"
-LICENSE="LGPL-2"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kpty)
-	$(add_frameworks_dep kservice)
-	X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdewebkit/Manifest b/kde-frameworks/kdewebkit/Manifest
index 5a7e5e0e3994..ee63922fa49a 100644
--- a/kde-frameworks/kdewebkit/Manifest
+++ b/kde-frameworks/kdewebkit/Manifest
@@ -1,2 +1 @@
-DIST kdewebkit-5.10.0.tar.xz 29260 SHA256 102587ba4cc94618e36329c56cc5a69fd500d534eee76b80cee60f5963177c21 SHA512 0612e3e6ee454864367d8cd604dba971289f4e6f89ada8346d36aa0337afd0ed7506fc0c44e02d9d024efe27d7080603bbfbc079dba1bc070a34850ed2e0ba5e WHIRLPOOL d707c0fcc520ad7c08d9322ce055d64d9824105e7c9dce89669a65e0ed6e2f650ab481154002ae72a92cc98fad3462df5f66a0bc6f14a4b44374c1eb543afa82
 DIST kdewebkit-5.11.0.tar.xz 29336 SHA256 9500eea8d5a677aa29483a93df06d60e7cca2c5fa159380b8b86fae3fdd50a43 SHA512 f4cb0c35386c6d2fbb94d1c467f8dd76b86f397697f7e6b6c70d7f730b0a4007009a71c4bc360c7b0b26981976f8506530015b7e1664f2377e77795774a69145 WHIRLPOOL d8721ce4541c542d9985f36971f9d68b3569355626698914dc54837a442eaa8b6587d411cf807c6a88de428903d6a812c9ecf8ffba51365ae264774b4cd4a341
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.10.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.10.0.ebuild
deleted file mode 100644
index a4b648c0829b..000000000000
--- a/kde-frameworks/kdewebkit/kdewebkit-5.10.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kdewebkit/kdewebkit-5.10.0.ebuild,v 1.1 2015/05/09 10:36:07 mrueg Exp $
-
-EAPI=5
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework providing KDE integration of QtWebKit"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtnetwork:5
-"
diff --git a/kde-frameworks/kdnssd/Manifest b/kde-frameworks/kdnssd/Manifest
index aaf4e47aa78d..d292ec5b8f91 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,2 +1 @@
-DIST kdnssd-5.10.0.tar.xz 56416 SHA256 f16b8773360575cd7f2ab8ec279e74c3e8bd36b024b0060f1da41a0ba4c92a3b SHA512 f6cb945d5776e247f3b8954493d737fc503b65e3e44694d0b44074e79dfa9f6e2be1ae03cd462ebcef7ea55e9d559630befc5785f1d1c573af9455911c33bc97 WHIRLPOOL 0dde8cff14f1caf412a2ea7e3ffff238b06dcac2bcc3c4a3440903978c70ce613d8e06793a83efd5faa56183508f820af050866f4dd93f65469733adfea1c484
 DIST kdnssd-5.11.0.tar.xz 56476 SHA256 6ed49ed5ec96fb6c71e075e19db96e1dac78976c83b937bd1f569185c0f4cb4b SHA512 f6d4633a6802a492f3bd78f71b7b0876d56063c4c52f2465f8934a504f7a2f29c101e4bc7f68907da58ca3d12701dc9fda4d14cee9712f1dded80848b87926e8 WHIRLPOOL d9dfba34cb0ac99112de6c7d256b4238e9075d6c56dfd8ad0e0c998c71b4a07901654c55fc4159f4cedbd550a37811848fe6a6bfd15f7ae0fac10c2a873c7996
diff --git a/kde-frameworks/kdnssd/kdnssd-5.10.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.10.0.ebuild
deleted file mode 100644
index 05061e9fbdd6..000000000000
--- a/kde-frameworks/kdnssd/kdnssd-5.10.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kdnssd/kdnssd-5.10.0.ebuild,v 1.1 2015/05/09 10:36:06 mrueg Exp $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework for network service discovery using Zeroconf"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="nls zeroconf"
-
-RDEPEND="
-	dev-qt/qtnetwork:5
-	zeroconf? (
-		dev-qt/qtdbus:5
-		net-dns/avahi[mdnsresponder-compat]
-	)
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
-		$(cmake-utils_use_find_package zeroconf Avahi)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdoctools/Manifest b/kde-frameworks/kdoctools/Manifest
index 5e8acf0cf95b..b5332a761f7b 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,2 +1 @@
-DIST kdoctools-5.10.0.tar.xz 406092 SHA256 77ca52b448e6a9d0623ac3effddfec7aed62f1d1ed362b0aee136b09aabc006c SHA512 3d8fa75a9845e3e7084077b264882b59a83e59eb44592de7677575a9ef56cb997e3dddfef28f03ae0310b045180cd568ae1c46de6209d173e17990d546816c29 WHIRLPOOL 6b7a839553c2ab1e44374fcf68bafc452d7cb8030c5791859488f6a8b3e6dc08bfd6c60e5a0573ef14c5bae5d8efc9d0d6d6895d5c742d4bbe9f62c7d7f8508c
 DIST kdoctools-5.11.0.tar.xz 406168 SHA256 082097eacf949d511d956421de76129e23b2ab239b98019f58adbf57f1693d36 SHA512 21bfe7f3654d9f3728e0e3caf11219f19614638752639f21bb0f5f001540f533c3d0252c44634f416a6af2211e82d3c00e808ad50882bfd18722d21ef076b03a WHIRLPOOL 19024e1c5b35ea01516ae697c3f2212f981b5d9d0bd12cf07cca8ee8bb6e6d0dea3d745181339e8fd59c9adc01ced5e42251170d314c7e0fe1a9c1838dd41681
diff --git a/kde-frameworks/kdoctools/kdoctools-5.10.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.10.0.ebuild
deleted file mode 100644
index bb34a80ae7be..000000000000
--- a/kde-frameworks/kdoctools/kdoctools-5.10.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kdoctools/kdoctools-5.10.0.ebuild,v 1.1 2015/05/09 10:36:06 mrueg Exp $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework providing tools to generate documentation in various formats from DocBook files"
-LICENSE="MIT"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxml2:2
-	dev-libs/libxslt
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-perl/URI
-"
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index 3a7fda64eb1d..434e4603f2af 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,2 +1 @@
-DIST kemoticons-5.10.0.tar.xz 73248 SHA256 79bee710ec31f1385930f95a2d2c98310b286fc3e9457d4ecf02363009907044 SHA512 a94bef7da1ea539fea8fa83214b28581f5d062ab7100f9b2e2997269937829791f3c6c0936f15111decaa32565e2da48efec2f7b351590030e18f7736b630190 WHIRLPOOL d9defcac97c4d73e5d9268749211d663dc3de98f6cda1606e256b9234fa0a6b7514725c6dabfe2c5643a50466c0e9eba87170395105fad570e0798388a7a6bc7
 DIST kemoticons-5.11.0.tar.xz 73400 SHA256 aaf557fac8f12a8766e9e0dac06dffb2f3b7c7838c0c362cf3e5d22305db5723 SHA512 3267ea13331e897668ed44e352d54dd1e3cfa035ad3cda705b7c73c467fdf4bde2a1b8e2efca24050d2c0e6674c76deffc7d93eefaec7d2f0d49964980380fe5 WHIRLPOOL 647264cc4055f073b1bcb8b61eb72e4abea8fc9b391d667828895d0dbc79225b8dd5a5da12369d8b263ef3a6c3a92f3c620a5de950905521676a6363191d51a2
diff --git a/kde-frameworks/kemoticons/kemoticons-5.10.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.10.0.ebuild
deleted file mode 100644
index 4c5debe40d90..000000000000
--- a/kde-frameworks/kemoticons/kemoticons-5.10.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kemoticons/kemoticons-5.10.0.ebuild,v 1.1 2015/05/09 10:36:05 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for converting text emoticons to graphical representations"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kservice)
-	dev-qt/qtgui:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}"
-
-# requires running kde environment
-RESTRICT="test"
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index d6669dfcf1f2..6487023b8054 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,2 +1 @@
-DIST kglobalaccel-5.10.0.tar.xz 85744 SHA256 de29811ba968738b6514d44df870857b961a82a4395582af1e20fe909223d90a SHA512 d85ad9836deee9434ddc9f41b5cefe44a81c4fc9c6e293db55fd1cd6bd4a574b35a6dd2ec03e738b4f73950ff6c1053a8eaf7cd7d5d6d91d70abb1865e759cdf WHIRLPOOL 79c80d33849fe34856bc65a6c0e696825d33022793f1b559a71fcee75d990dd89a37443afa9a5da0927dc9fc309a00fcbc2a80cf0e825be9016bb5ef00f68926
 DIST kglobalaccel-5.11.0.tar.xz 81244 SHA256 bedf7dd6e5c0d5328383b66eb08108e783a1d2a0bac64fd500c763685421b4c4 SHA512 180536d6535300b6298873021b2773288aa1ca1e7583f00cd978e7e6cfe050b16e533a9e98a0d207f1e72410fbb4068c81d87b6cf15ca2979ad791e234256db6 WHIRLPOOL 98be282589c08e86a42586b2a846f9ec7d671062cbf1e38ed0d7d0ccd1b748b07ba68764af3703b9f1db6bb758c530c35df8c20ff6e8d06e9a4f53c5b4e0bd97
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.10.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.10.0.ebuild
deleted file mode 100644
index 76fe8261c2c8..000000000000
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.10.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kglobalaccel/kglobalaccel-5.10.0.ebuild,v 1.1 2015/05/09 10:36:04 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework to handle global shortcuts"
-KEYWORDS=" ~amd64 ~x86"
-LICENSE="LGPL-2+"
-IUSE="nls"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kwindowsystem X)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	!<kde-plasma/plasma-workspace-5.2.0-r2
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-"
diff --git a/kde-frameworks/kguiaddons/Manifest b/kde-frameworks/kguiaddons/Manifest
index 46c7192dd08e..288209c627da 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,2 +1 @@
-DIST kguiaddons-5.10.0.tar.xz 39060 SHA256 b9ab39be70aa273ad8116d826c7f59177504620a8881b888af8b53e662237f0c SHA512 e9c7324072b2c4f58535ffcac421bd878de8b3cccad4c8ecc8d7e811f44d6ba37197ce879677c9ebe3c35a9300f29dfebaf761a2861a5ca7837698014c4113ef WHIRLPOOL 31d9fcf1a7b3200e4469a57bb5502290befca1e34b0f697ad75b4e279305b4db25978407247935f9d2d69db069f9fbaecb5d637f24e16dea4a5f0e789f649c79
 DIST kguiaddons-5.11.0.tar.xz 39152 SHA256 8c8f71f15b2a117638a8eb0c192e56f607a94758392c0b01c646034a346c1c9b SHA512 e0dab10a645714f4f370d46329e05a66b5f08db601b09cea202a86e32f264e3a029e140dfe395e41f8f4328013087326a8bba563f16ec8086e861abc3910d8b4 WHIRLPOOL b21c4040ad56f22b62aecff15ec47990319a2c95fe9ba7d27ffbd13307c95e4cade63a19c60c4bd64439735563f9c278f95a937dc6e3052cc44254f41c2a72f6
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.10.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.10.0.ebuild
deleted file mode 100644
index f16c9e3ef974..000000000000
--- a/kde-frameworks/kguiaddons/kguiaddons-5.10.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kguiaddons/kguiaddons-5.10.0.ebuild,v 1.1 2015/05/09 10:36:07 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing assorted high-level user interface components"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-"
-DEPEND="${RDEPEND}
-	x11-libs/libxcb
-	x11-proto/xproto
-"
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index a8bf6b15c645..38a51e485f92 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,2 +1 @@
-DIST khtml-5.10.0.tar.xz 2070336 SHA256 4236c175dda5dafabdb7d4b0e31797bb150d5639ff1c21915e71cafdb467ff73 SHA512 3b695ad200d093b82289445a4001c6dfcd7f9d93ccf89c9da243517d90c1c7bf811d25590bb96140659cac73b9f16f090704c883646d07d42f3475fc397cba31 WHIRLPOOL 382ca29de60e5351018261480b98b3caf4e1c9af0b29de8eacbfd81485018be704c0e4ed63ec4868052131ecdb03af0ef02cca54c2574c063dec84e8a10fc30d
 DIST khtml-5.11.0.tar.xz 2070596 SHA256 c13317ca12e50893fd79ff9dc46a15368e71cc93295fc7f28362ecbe4b5ece86 SHA512 ef1e2f1087a0c55a8b00cdf4031ae585a946d38fce6d52fe7b753c2a5ef014deb09c3d8bf4aa839b7d3f4c94414e0b5b63e1f96c0b69b556510dd67f8098290b WHIRLPOOL 42043b566437e29a6ffe57331436edc3fea2ea19fe1936e4774adeecd2b67951fe670d2d59bd042ede003ea9c31b7676dd0c4002449a4c903680500a2cea7ccd
diff --git a/kde-frameworks/khtml/khtml-5.10.0.ebuild b/kde-frameworks/khtml/khtml-5.10.0.ebuild
deleted file mode 100644
index be77ff3abaa6..000000000000
--- a/kde-frameworks/khtml/khtml-5.10.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/khtml/khtml-5.10.0.ebuild,v 1.1 2015/05/09 10:36:05 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KHTML web rendering engine"
-LICENSE="LGPL-2"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="X"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-libs/giflib
-	media-libs/libpng:0=
-	media-libs/phonon[qt5]
-	sys-libs/zlib
-	virtual/jpeg:0
-	X? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-libs/openssl
-	test? ( dev-qt/qtx11extras:5 )
-	X? ( x11-proto/xproto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/ki18n/Manifest b/kde-frameworks/ki18n/Manifest
index 195d1455d226..3f328375c236 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,2 +1 @@
-DIST ki18n-5.10.0.tar.xz 586288 SHA256 9ae5a59ad3ddc8562eba7555f3fd532d0eca3b1ca9fc568d9e70db25083b4275 SHA512 995b55e5e7c58a527de94ecc24b66164c87b37de965138a564b9893a0db56c11a6f3b9e2f489d8cefbae1378b41ca696803568fd78b60e017b3176b540593d16 WHIRLPOOL 60669b4d9cb3a1d83c44d42de9fcf5cc868fb960dc6639cd9b13c43ecafbce7218964413b3ec7ab0567d4f9361b4ba7fead50faa6ac841a0f44a998d26fff715
 DIST ki18n-5.11.0.tar.xz 586568 SHA256 e2f2be1120d403343f0304b0ba5996b4da3592dbd8f486cfec208efaf38740e7 SHA512 1ed5e1e1b9e283bd73ea8dc769f709096559b1d1d9a6ad1c42a984bda9333a3a34032192be3423a0735ae690cb9252c6276a923b0532ff7538b2b281d6a75339 WHIRLPOOL c2aeba50363b4b3e9186d4bb2fe07068ce42d1976c11348cd0fcbba2683731e959e91d6f08187735217eb6aeff33c0c2b05da869fb0a6ca2d8334783a0e3f9b2
diff --git a/kde-frameworks/ki18n/ki18n-5.10.0.ebuild b/kde-frameworks/ki18n/ki18n-5.10.0.ebuild
deleted file mode 100644
index 6255cd09c30f..000000000000
--- a/kde-frameworks/ki18n/ki18n-5.10.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/ki18n/ki18n-5.10.0.ebuild,v 1.1 2015/05/09 10:36:08 mrueg Exp $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework based on Gettext for internationalizing user interface text"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtscript:5
-"
-DEPEND="${RDEPEND}
-	virtual/libintl
-	test? ( dev-qt/qtconcurrent:5 )
-"
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index 52c19fb412a1..bf54441162ec 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,2 +1 @@
-DIST kiconthemes-5.10.0.tar.xz 194856 SHA256 419e870310e7ec85f95e44946424467a15b93efe8588439a4468904687797ba7 SHA512 d5112d923516f5c9146119f04baaa5743aa0076b3f966fa99c0d346fb58c6b366c1ba44e961420234ef87844ee75f69d13918151a4002888d9739d74a8542f3c WHIRLPOOL 8dc6e591de21f9fe3399bafe3787bfe5a6f79a421bca2a7a8ee6929181a7240f674950514ed51ff3bdbb8095395e0e4e4acfeb99f7235cdbd649d50d7e487656
 DIST kiconthemes-5.11.0.tar.xz 194988 SHA256 00e3b12852923cef9ecfd27918f110e2d16f1aac84d2bce7425c8b779b201f3e SHA512 e8587ef03ad63ece3c42d2befd0978afed2de3a244425f7b4448c4e0c2dca8a3c7b740a4e1bd9ab6a6fee5870bca374489a44772476d986e8725b00c0f6e6b47 WHIRLPOOL 0f944e92f6f66ae855cce8b8af279bfaad708c6493c413d17be6e13e3001fde5126d29cd4ef0f14fe5c7c6b80c0d70169336dd38e8a3db804560f41b81491ad7
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.10.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.10.0.ebuild
deleted file mode 100644
index 9b348e925db2..000000000000
--- a/kde-frameworks/kiconthemes/kiconthemes-5.10.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kiconthemes/kiconthemes-5.10.0.ebuild,v 1.1 2015/05/09 10:36:05 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for icon theming and configuration"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kidletime/Manifest b/kde-frameworks/kidletime/Manifest
index 57914bb44c79..a4df3088ed3e 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,2 +1 @@
-DIST kidletime-5.10.0.tar.xz 23464 SHA256 20138a5990930a882feb507c7dd2127d1a6a31603a72623a9e4fa62ec4227c67 SHA512 ee9f7ba164047e72f18111ba594f2d1f637950c6efe51157900f5cf6f77f2691cc6fbfbbe0d44d4446cd6786933e24355bf319b317ab066f55dd4377e8ecfc1f WHIRLPOOL 606671ac0eae0b9835fbda68cbd2c46225a5cc7c9de3b6cea60f2110689a903b2d008db9e0ca6db6cbc57b20f0332435ce5291ba15fb362821371800e9e2b0de
 DIST kidletime-5.11.0.tar.xz 23524 SHA256 ccdc8b3e23282de64f9c0da69d2eaa50fe4428f9c8b5523cd61b0ffa9794be17 SHA512 b6af53c02a422980dfa5a79b3606870da2e9067fa936c729f527cd143a02a076744b0162eada3b505b8010824868df74cd12e3b748e24c01168de9366e9bdbf2 WHIRLPOOL 59f423c23d84d4240615f625426ba72761a8189f9c62c945a600bf1782f8f4ed1130442ccf439170b777635bdf8f5eded93458804d48a56398e24c9d2971c91c
diff --git a/kde-frameworks/kidletime/kidletime-5.10.0.ebuild b/kde-frameworks/kidletime/kidletime-5.10.0.ebuild
deleted file mode 100644
index a6dc59b79229..000000000000
--- a/kde-frameworks/kidletime/kidletime-5.10.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kidletime/kidletime-5.10.0.ebuild,v 1.1 2015/05/09 10:36:04 mrueg Exp $
-
-EAPI=5
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework for detection and notification of device idle time"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtdbus:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	x11-libs/libX11
-	x11-libs/libXScrnSaver
-	x11-libs/libXext
-	x11-libs/libxcb
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kimageformats/Manifest b/kde-frameworks/kimageformats/Manifest
index fddb48465cf7..11e59dd8647d 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,2 +1 @@
-DIST kimageformats-5.10.0.tar.xz 93512 SHA256 5e09e81ca0a6f3edab335998a877822c8d701933bbe2ae6e3e68cdd83c0d1a90 SHA512 87975b1dc500a8f5b07b8cddc0c4ac7372b47e1842382c473cfb5aa8bc3ce62b05c7d3b4839ced4861cb24fa87e637e4086b87b484423e67d9a7f03997766a93 WHIRLPOOL e8f9c74019570a47213ef6edad87985feda33fc92c4702c2b2ded1ddb2e53069c32f476e3dbc302b3308214678ea0afe6e616f4961705330963bebdb00d20970
 DIST kimageformats-5.11.0.tar.xz 93588 SHA256 61daa87b4c8cc7c7aede6d0cb5f94f336b1a2a149f037d4947ad80ac0a13f159 SHA512 4611649b649edb448e04e1f408e2b99ce5175cfa9612ca47a4d7e549f3b5156f8a425352fc0a733bbcdfb55053ee8fcd7d7fbe63188fd24af9c7f3c95a4abed3 WHIRLPOOL 53231fea7593027460d46c5dff29e0778400137dcab8348a58f225b0bc20baf7295d1696e403523185f022b2a5a603318fdec3e02e8a88c6b3d14526b04eb0a8
diff --git a/kde-frameworks/kimageformats/kimageformats-5.10.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.10.0.ebuild
deleted file mode 100644
index 15afa2e903e9..000000000000
--- a/kde-frameworks/kimageformats/kimageformats-5.10.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kimageformats/kimageformats-5.10.0.ebuild,v 1.1 2015/05/09 10:36:05 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="eps openexr"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	eps? ( dev-qt/qtprintsupport:5 )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( src/imageformats/AUTHORS )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package eps Qt5PrintSupport)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index e0882d37118a..996aaf03ccbd 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,2 +1 @@
-DIST kinit-5.10.0.tar.xz 115856 SHA256 5fa734456157294c7b50b2dd911ff1b702eff1a2f8c0ef2366a9f714ec09aa09 SHA512 14da08c87b8e65e0427a155edbe102b48bcb127e44e5a7f450d09433506541b64bb5d41ea8b39ab54e555ac62553003464d540989db771a4f04c3aeb698875e0 WHIRLPOOL a91a890ec1e6585636b824f555e58a129adecae783ccd7b8162ca041de2dddae57aaa48b7d80c996c129dbb9ae9acbdbcf7d4748fc27392ac6bd4655b1be0d97
 DIST kinit-5.11.0.tar.xz 117096 SHA256 5e4557e6f699e18e90e5b66abef14b5796e7451f12896b7a417a99f5a10a1151 SHA512 926babfb382f52b4cfbb767fd62af3aab5b6026febab6891e09e6a186b004847d2fb03c91d80ea4ee4d4630ce2552e8202a770b9047d71a43e3399ff9ec3096c WHIRLPOOL 691af3bf391d94b0c8b4d2d9e5c131fc8b194913b0eab3ea1ddf7e29eac75d623245430ed4654c0312edecfbb742e109dff33c2708f7fc246be19c543339bf49
diff --git a/kde-frameworks/kinit/kinit-5.10.0.ebuild b/kde-frameworks/kinit/kinit-5.10.0.ebuild
deleted file mode 100644
index 6299d200569e..000000000000
--- a/kde-frameworks/kinit/kinit-5.10.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kinit/kinit-5.10.0.ebuild,v 1.1 2015/05/09 10:36:06 mrueg Exp $
-
-EAPI=5
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Helper library to speed up start of applications on KDE work spaces"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="+caps"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwindowsystem)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	x11-libs/libX11
-	caps? ( sys-libs/libcap )
-"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package caps Libcap)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index db13646f87e7..0069d16e4b07 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,2 +1 @@
-DIST kio-5.10.0.tar.xz 2843704 SHA256 990036a2fab9977991ddab1ecf1be59e70f6b8f29c5b92fdd30e5da38bed6bd1 SHA512 fda1ebc8a581972afe72d336e244ff95da252b629806f9f638dc293d683d287163b019ad577ada844a0512e46286e7896b6d264c5b7358c6bc15b9b3764a1964 WHIRLPOOL 33db039e95557b672aa2bff3af0781a3004224f087f0469151ab8ecec03315f05b63d60a2dce2b08d2b33b00a16b108c97a95a2dcb91bc2b88945466162f32b5
 DIST kio-5.11.0.tar.xz 2846400 SHA256 75a24394b9a8d70bfc1c882d77e3e9ad417ad4b782b7f174a741c4a09e82339b SHA512 5be8db1f64db51baf79070222c281805dad58ef7013cf8172494ac8e85c5d0007c6a856acadea6252984b4147f5b87ce5e14e66bc8c0b2b28982f51738a8c515 WHIRLPOOL 90a27175f6e2c306b8c2a72b5d254bdfa7b22629cd10cfd78cff2a456f98930a270e1d904609fa2bb7d1478d3a6b353cedfe1e7a72802deca7c8114bdb4b97a5
diff --git a/kde-frameworks/kio/kio-5.10.0.ebuild b/kde-frameworks/kio/kio-5.10.0.ebuild
deleted file mode 100644
index 660a47947aaf..000000000000
--- a/kde-frameworks/kio/kio-5.10.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kio/kio-5.10.0.ebuild,v 1.1 2015/05/09 10:36:05 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing transparent file and data management"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="acl kerberos X"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	dev-libs/libxml2
-	dev-libs/libxslt
-	acl? (
-		sys-apps/attr
-		virtual/acl
-	)
-	kerberos? ( virtual/krb5 )
-	X? ( dev-qt/qtx11extras:5 )
-	!<kde-base/kio-extras-5.0.95-r1:5
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	dev-qt/qtconcurrent:5
-	test? ( sys-libs/zlib )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-proto/xproto
-	)
-"
-PDEPEND="
-	$(add_frameworks_dep kded)
-"
-
-# tests hang
-RESTRICT="test"
-
-src_prepare() {
-	# whole patch should be upstreamed, doesn't work in PATCHES
-	epatch "${FILESDIR}/${PN}-9999-tests-optional.patch"
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package acl)
-		$(cmake-utils_use_find_package kerberos GSSAPI)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index 26e9c4d087fa..cb82c1b977ee 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,2 +1 @@
-DIST kitemmodels-5.10.0.tar.xz 374048 SHA256 06570a3c371837e9d50c779c7acdb6508d6b2c93b66eb1251504f998bce6c3b0 SHA512 7c5a5012d6b0e03270cc75957accfbf6aba896a1186f918db10f15f0d259e6cae668fce0ca596333ce8b69d80ec1074c4aca36c19ddcead4a2de7e97d088f06b WHIRLPOOL 407b0a75526799fa445ae6c9a52e9535dcbaf565fe97179291444132383b4ced91900219edbb426ee770b1a0009db64c29cde0f4ccfa0c4130e5af47c2199815
 DIST kitemmodels-5.11.0.tar.xz 374192 SHA256 635bfe99800ca4e6941252f1faef91d700d7866fd0c15f813075940d70094f9c SHA512 e7f57f8bea1fb9177c314129f4f56cfb6c4b917f0c6469241579e29773c536fe1177af9cca52802a0b541203247c127beb968c279d4e8d6994ad919fd8a0dc70 WHIRLPOOL 737ba8089f4ef47f6803c3d19d11a552cf8b76374b7aedb81c412b54edc02aaa97aa8c79833dd8fd01b4dc21fca128636a194c52299ff044abbadb59a651b328
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.10.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.10.0.ebuild
deleted file mode 100644
index abc6f0a51987..000000000000
--- a/kde-frameworks/kitemmodels/kitemmodels-5.10.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kitemmodels/kitemmodels-5.10.0.ebuild,v 1.1 2015/05/09 10:36:06 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing data models that help with tasks such as sorting and filtering"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-DEPEND="test? ( dev-qt/qtwidgets:5 )"
diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest
index 75b2e082f607..8d432311464f 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,2 +1 @@
-DIST kitemviews-5.10.0.tar.xz 73924 SHA256 7121d989e1d649e90a38f25079de094b289ca4a64aee8847171ec723d3893036 SHA512 1ec721ec13a3fb6aad0dd216b4db4eb6eaffadd711369fa8e5418275907be4a1ed9d80ae7f1769c226f648c747180637ad2bee5667ed5f858df8dc45d60fa9a6 WHIRLPOOL b195a100760abec1f91009e1912ae2e0ce595a05edd7513e1dc25fbbb127109070d0dffeeb71b6b219da81f36e246d6553090c50c98ee1a500fd242b8d82377b
 DIST kitemviews-5.11.0.tar.xz 73996 SHA256 7f7e4ae72d6f910188f9c0cbc1c6e24263a2bf4880616a83cead5e16d9e769e3 SHA512 efa31d58893212067da97b69c3b6547d832df9ad02a1476dfa2d5b74af18cbc1755fe5f55b289e82275f03ed2a26827fd2c2ff693065842620967136df3862dc WHIRLPOOL c46470d6677a9c39b88f9879e7cab7598834ca6a24fba7fd3c90232971b2d6ffcd2de078650403a2b79a15ab7a0924347548412d1987d65dd003941e34715694
diff --git a/kde-frameworks/kitemviews/kitemviews-5.10.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.10.0.ebuild
deleted file mode 100644
index 52cc8216f496..000000000000
--- a/kde-frameworks/kitemviews/kitemviews-5.10.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kitemviews/kitemviews-5.10.0.ebuild,v 1.1 2015/05/09 10:36:04 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing additional widgets for item models"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-"
diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest
index 7fe4e58f0d5d..bbd9b0f0b9ce 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,2 +1 @@
-DIST kjobwidgets-5.10.0.tar.xz 89064 SHA256 26346f330599fba90c2e76d50b9e0178d1dd87086733ffa4ee68122a2c07562c SHA512 88ddedd020e5a8115cc6c8730ae58bcc68dca24a61ddb19b8c4554ccf1f4f7a56ccc4997f5c40738d00c518a26076b5d1e34aaec58fd53d8ff7e9c838f63d865 WHIRLPOOL 14349845776ebf10e2b3715ce71ff1e2d2f95e4584508ecf0d85b58ec5326900dedeabf8db363f5c393a1c2609816a613cf98265b65ca9d9948b7fcc2c89a5d0
 DIST kjobwidgets-5.11.0.tar.xz 88904 SHA256 6a202ae4d1835132d48b974dee2f4aa53b787836be6fce3bef6dfa70a09d51a9 SHA512 5f4527bb9946dda15f2c1130dcfee9a97eb04f5556ac33ce82480a14dad85b37c3e9c11988b32b988724b7e05b6cf35e2b00c9dbc1600ca0460c114ec95492bc WHIRLPOOL 5b64d95f8ea8be7ae75a73024936ddefe5323fa05f24a11866c59e24ced5612fb1860fd67726c0b8b41b3673c169d1d3c0fc3ec3e5a99f34ec9699777c045d09
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.10.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.10.0.ebuild
deleted file mode 100644
index 21c430f448c9..000000000000
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.10.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kjobwidgets/kjobwidgets-5.10.0.ebuild,v 1.1 2015/05/09 10:36:07 mrueg Exp $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls X"
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kwidgetsaddons)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	X? ( dev-qt/qtx11extras:5 )
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-	X? (
-		x11-libs/libX11
-		x11-proto/xproto
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest
index e1d764f6ed39..5bb87c58a7c9 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,2 +1 @@
-DIST kjs-5.10.0.tar.xz 290640 SHA256 016f7a6a193293ef29ded12bce75f2749832101bfbb407239dbcec7a5eb27750 SHA512 654c31e210e95ff2417e965d333bb5c61d43815bc5ae4a24c591ee9a25b8a5362cdcee3ace26b41d7353dcb9c0bd7fe0fffc8d6e56b596c8a000880e0f97f80e WHIRLPOOL 344b99f2075756423f7fe9836e566034c8a86d03fd2441d7145b6ad2a13b1224372356388ec9e9dc0eb0600962c72447e52ad381b9c60de4fbb2db596045406c
 DIST kjs-5.11.0.tar.xz 290720 SHA256 5d722b38e5d28c4b8635ff8a029f6061ffa83858316b0aa40adf4d40f7b77bf5 SHA512 894db19c978baaf448e7ecd160066bc05922aac6263289edeba13c6f1328e0eea3df22c4a921a77cfb60d615b4b3c2e5768d1e0ffbc4d9fc8d9eb04863b50eb0 WHIRLPOOL 131accb065ac88d6826f078f7ac569663c7a934ae2169b730fd7cbc99f66d703a8dafbfa653753ef4f98ac20a22e6b9a9981f7003c8c5535576df0867bb3b22d
diff --git a/kde-frameworks/kjs/kjs-5.10.0.ebuild b/kde-frameworks/kjs/kjs-5.10.0.ebuild
deleted file mode 100644
index a10aa5273fe2..000000000000
--- a/kde-frameworks/kjs/kjs-5.10.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kjs/kjs-5.10.0.ebuild,v 1.1 2015/05/09 10:36:08 mrueg Exp $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="ECMAScipt compatible parser and engine"
-LICENSE="BSD-2 LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libpcre
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	dev-lang/perl
-"
-
-DOCS=( src/README )
diff --git a/kde-frameworks/kjsembed/Manifest b/kde-frameworks/kjsembed/Manifest
index 8de8b2c3aad4..6be5bddd588d 100644
--- a/kde-frameworks/kjsembed/Manifest
+++ b/kde-frameworks/kjsembed/Manifest
@@ -1,2 +1 @@
-DIST kjsembed-5.10.0.tar.xz 164320 SHA256 b4f3b0df17253106f1b0483b2c44050016c32925af4e044b57ce893bf45e42a4 SHA512 d42c10cee8aeb793d9fa190e36b6c60e189bfe098cba7a1d501fe95f9efc17bf5c59ab939d4b852999e34a2807a9f4af1a14f7b855424be54b3533d4bfb33ab5 WHIRLPOOL 759c857690f640835236f7e20240e0a6a05226f36302d6e5233ce892d9d28117d8b74c578552057013cf8ca4da6c18edcc34fcbde3c6733d324df88552039eb0
 DIST kjsembed-5.11.0.tar.xz 164404 SHA256 97fff81d5f262565b067b4967405e332892df9aeed709204d9b628ed52130a6a SHA512 29c5476a43d1aee1e57c08c9947d9bb14a43bc77981246ebee61f32dc7d89eef78a4a82f1cf9fbfa6ca3f670cde659daf1380d81ceed696ae488bfd7b8cac4b7 WHIRLPOOL fe5d7ed008944f1d428ac3d6e83702edcd200973b58244cfd75d10274e1745db953da1481a47b7bc8221c51181de9e64c2da9451f6f5626bfeb44a2baa33acdb
diff --git a/kde-frameworks/kjsembed/kjsembed-5.10.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.10.0.ebuild
deleted file mode 100644
index 79566290a7f2..000000000000
--- a/kde-frameworks/kjsembed/kjsembed-5.10.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kjsembed/kjsembed-5.10.0.ebuild,v 1.1 2015/05/09 10:36:06 mrueg Exp $
-
-EAPI=5
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework binding JavaScript objects to QObjects"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kjs)
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	dev-qt/designer:5
-"
diff --git a/kde-frameworks/kmediaplayer/Manifest b/kde-frameworks/kmediaplayer/Manifest
index eaaabf5dbf81..150f6ff52905 100644
--- a/kde-frameworks/kmediaplayer/Manifest
+++ b/kde-frameworks/kmediaplayer/Manifest
@@ -1,2 +1 @@
-DIST kmediaplayer-5.10.0.tar.xz 9340 SHA256 ae91755ef7bc882a088f42c6eed2e9bc9467def7ce32664523048d2dd5a32760 SHA512 aa6a399514b5c8548834bef2da4616693034008dcf6bd0c5fa2f36ad98fa675df1a0b0e51fee8bce7e5745d239cb1f468294f58637f64822440d542315060a5a WHIRLPOOL 96843b757e0661a5744c80739423d8d7ce7330d40dc4f3a17d4a779775ff9f6908b5bcf771f76e2120cdf2272115ae839e3d6ef62aa4939802a1c75f32a1ecd9
 DIST kmediaplayer-5.11.0.tar.xz 9428 SHA256 4571b51e63befda4ab45b4a0182b3739bab11c56784042c125c2c6c4a8f89b91 SHA512 ca7137161f5bec1d9ffcce1fc3b9bfc9425526c69fe065e37b633bf139cdae926f0448653187ef27db7c28f03e0afc802ae3bbb55facd5c77f5fc036951ddf28 WHIRLPOOL 1800de9b181f6a8e0866b46ac0765a7d429979a1e9883f44d1ed5f9ee9818fb544957e390fdcf8e9d2cb8b2859b50cf9f3fcfa4271bd7e1406fe58b736f18d91
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.10.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.10.0.ebuild
deleted file mode 100644
index acd7dd556bc1..000000000000
--- a/kde-frameworks/kmediaplayer/kmediaplayer-5.10.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kmediaplayer/kmediaplayer-5.10.0.ebuild,v 1.1 2015/05/09 10:36:07 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing a common interface for KParts that can play media files"
-LICENSE="MIT"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtdbus:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest
index df8395a96178..f3567a3f0247 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,2 +1 @@
-DIST knewstuff-5.10.0.tar.xz 838308 SHA256 8796a9336ded3e1b729e034ae4fdd2a11391bc01f2259206dfcaef33f38144fc SHA512 5bb81bf918e846b91325807319d99c74dd8e53d60513b693822fc625ca9402446f0fca650e459c91ddaf0d0dcad67f46f6b60b897fe534025db9be0659bd4c81 WHIRLPOOL 7ec8ca7e2f1875d110c8ebc0acf7508748c9e470e315dbdaea8363124f131a9a452ffa0a7260b36d87054b2d9ad879ed3cda9d77d07266a8e1c582972d21e49d
 DIST knewstuff-5.11.0.tar.xz 850128 SHA256 cc1e747068f080c2fe57a59e794b0cebc7db8c79814b2e6053ab88472e210604 SHA512 9ee291a575dd5a92dc4a7c1ac93acea3f71a81a6727a5dd95a95565e79af45a1c7da59a783312330797ee5302dbf13da50ab8713839241438ee43e98bd3af2dc WHIRLPOOL 2a6f5d833d1e566666d5bca40a7bdecb5bb941444887af1191237454834000a7bff7b1bd94ab663557fab5b3ac24ac471e069475a867cf85108d76150c378f98
diff --git a/kde-frameworks/knewstuff/knewstuff-5.10.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.10.0.ebuild
deleted file mode 100644
index 5ccc17858abd..000000000000
--- a/kde-frameworks/knewstuff/knewstuff-5.10.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/knewstuff/knewstuff-5.10.0.ebuild,v 1.1 2015/05/09 10:36:08 mrueg Exp $
-
-EAPI=5
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework for downloading and sharing additional application data"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep attica)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest
index 3df33aff76a2..4ae4745aca76 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,2 +1 @@
-DIST knotifications-5.10.0.tar.xz 91872 SHA256 17dc0e13fc78bbeeca8bf66d3865fdb90ec8d349e16255b955dd33ce4522109b SHA512 3159b04b8f59cc2e45fd79f026e16f7bbc3c3988dc6860a5e913bb422f8e4645a4885013eb795103c95272e0c73a3eeafe757eef6981ac4168f94c2a6e931343 WHIRLPOOL 3f8437a95b20b17a6a324231d8ef9eb446bb508e39995380342268302ec0eff242dced11cedc1b5340d5e26c30529590e5fead730381152c733015f114fabafb
 DIST knotifications-5.11.0.tar.xz 92300 SHA256 04db2e0c21907dc5252e44a65233b432fff38dd051d9446515665d9c1f8f129f SHA512 d9825c45aa68fa51adff6e9383d6dde8260c4c99e7fbc6a4a91c481321a205aaec0624cf003b8c5ee4dfb96004ca5a240163445198c61c289b78ab53778f9da7 WHIRLPOOL 5fecb24eef8228174ea5c8e586c07934c2f615b9cb66ef9b04c474d309a9e102a78af8037ffa86659728fb2ee75be1e837b0d76489b742803c709a7c6a48e65c
diff --git a/kde-frameworks/knotifications/knotifications-5.10.0.ebuild b/kde-frameworks/knotifications/knotifications-5.10.0.ebuild
deleted file mode 100644
index c2458d847512..000000000000
--- a/kde-frameworks/knotifications/knotifications-5.10.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/knotifications/knotifications-5.10.0.ebuild,v 1.1 2015/05/09 10:36:05 mrueg Exp $
-
-EAPI=5
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework for notifying the user of an event, including feedback and persistant events"
-LICENSE="LGPL-2.1+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="dbus X nls"
-
-RDEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwindowsystem)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	media-libs/phonon[qt5]
-	dbus? ( dev-libs/libdbusmenu-qt[qt5] )
-	X? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-	X? ( x11-proto/xproto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-		$(cmake-utils_use_find_package dbus DBusMenuQt5)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest
index 18f42703fdc3..162ae0475b1b 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,2 +1 @@
-DIST knotifyconfig-5.10.0.tar.xz 81420 SHA256 953a98b53f7851a870de47ccb29d976ba25911466dd546f5118b4c6dfd6a0dfe SHA512 b8256d0df00f435b236a66c3ac0ac10e104d86d4122dd2fd33270cb10be83892d41d81c388c458222d35a5505799fd380556c1ded8ff70918643a7ebad8bc3da WHIRLPOOL cfd5cfd2c7138e1b2e495f1a9f186f7ff5c8bbb977498d0ab43ce56bcac12c4a13bb4fb09f18a7e130b597a7a7e1ce44ef04bae0343a141a810d4f122b351068
 DIST knotifyconfig-5.11.0.tar.xz 82720 SHA256 7ed778a4be005c3b655ee69e6312fec2a5efbf7d492d12501331e7d611d3c516 SHA512 fd5e6d1d7bb2f73e6e9d0e6cf8e6c3b085f9a24ba25c9635dfa89d143aebaa1f9a9daf9b603757d0a1f3f14632754ea476f954bf7c4699e72dbf814e39eba834 WHIRLPOOL 90ba7cee3f1915ae9ba93eaf4283d11bb0aa61a18e3e471893c4e4b2f7e4eee1264f893514346299ab2f58dc7e7981b7b063d8eea29fe3568055e480d0322681
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.10.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.10.0.ebuild
deleted file mode 100644
index a4ff46c64e60..000000000000
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.10.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/knotifyconfig/knotifyconfig-5.10.0.ebuild,v 1.1 2015/05/09 10:36:07 mrueg Exp $
-
-EAPI=5
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework for configuring desktop notifications"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="phonon"
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	phonon? ( media-libs/phonon[qt5] )
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest
index fe992c6049ff..f9c5ad8eec6e 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,2 +1 @@
-DIST kpackage-5.10.0.tar.xz 96904 SHA256 0b236f4404f09fd8b683a94ea37f49da76482ba396fa35af91b4a079f4b4bd30 SHA512 66e7734d016114222d4b445145fc7055e0ed99bff64ccb10c87e35cb62f1a8e90907cf52f3c4b12c85d998965e30107b5ffe7f3c7937857a5713bc2e792bb173 WHIRLPOOL 45907153c04a8168d33e6ee448fd800bf2605c9638954652cd45b056e7fa985f2ba52bea26867539eb9352ad4ba1bf11b0221968a1db8d8fb93598b39dfe5eb7
 DIST kpackage-5.11.0.tar.xz 97664 SHA256 6ca56c7575cea53f884111f7df47deff105e42546c24779b2d191dd397b53892 SHA512 911d3654880e868643b2c12f27b71c6f16be6f1f5350990194845fc0169b611dfa21a855f02ecbc6b0a8943016805aaa1ac9e9356b84bf60ea98001e434a447b WHIRLPOOL 1c28c1b964a8c32d8965b339f3ea2f51948cc32f5211637a53d55f118c1a0f20e9c9ba214580f0b7fba540755192c6ee8d5c811a5dedde8027a548f89cc5bfd5
diff --git a/kde-frameworks/kpackage/kpackage-5.10.0.ebuild b/kde-frameworks/kpackage/kpackage-5.10.0.ebuild
deleted file mode 100644
index 43cc7e1b15a0..000000000000
--- a/kde-frameworks/kpackage/kpackage-5.10.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kpackage/kpackage-5.10.0.ebuild,v 1.1 2015/05/09 10:36:04 mrueg Exp $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework to install and load packages of non binary content"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-"
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index ede983a3e74b..637c1e57c4ba 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,2 +1 @@
-DIST kparts-5.10.0.tar.xz 153928 SHA256 3b97113d1d62ae67cda02ffb400ca09273a47bddcb0f09e663c5d08d459e3f4c SHA512 97928fd7bd49342200557b4ca9ecc8e4e8d21a524a52c4710c9cc12f2e11bc2847c656b9da67199f63f24ce0696e1c4fbc5d1dbed67bf021a2cb033fcb9efba3 WHIRLPOOL 8aaf9bb0e7dd2480a478c10d5ea8289e737f6dbbbdfcc28aa0d5978df7dcaf8f091f925d6fa60b144498849b396311e7db477c077e76871fbdadb6f761c0f2b4
 DIST kparts-5.11.0.tar.xz 154064 SHA256 0787e228f110ef8a3c7d0408b031f366131315e7a0121ea7d89163bc684eff41 SHA512 078c66a4158be68a1a2f72c5e5a645d4ea8701b3a533ffc8a7c31017ccd033ca6ef19c5eddd7ff97126717c430c119567f6fa6af85e3acc0afbb0608199b16d2 WHIRLPOOL 1cba85397419c4ad8ff601d819fdced45050b39f68753373424dbc1b884b8e4c6c2600480112fbfef27c1c63fad688fc8777bf47708c94667a2e21abc5eeb6ba
diff --git a/kde-frameworks/kparts/kparts-5.10.0.ebuild b/kde-frameworks/kparts/kparts-5.10.0.ebuild
deleted file mode 100644
index 8c12bd454847..000000000000
--- a/kde-frameworks/kparts/kparts-5.10.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kparts/kparts-5.10.0.ebuild,v 1.1 2015/05/09 10:36:06 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing elaborate user-interface components"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep ktextwidgets)
-"
diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest
index d4cee7d2fa3c..88c0dbd6baa6 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,2 +1 @@
-DIST kpeople-5.10.0.tar.xz 56308 SHA256 6a327e888cf603d5ad7bbbccc78981bd6e5b26691ba88860fa2f0705ef60a62c SHA512 616b736f9a44455ebd3526e6a8fb6d2557d9340d22834dcb0b322fc72abe9ffbe8066fdaf09d8153aa41a2c2b2d6bf820672f6a1dc0cc301328a4bd2a2ff59de WHIRLPOOL 185f200ac74b7c064e5b28ea0b78320e2c377837da4bb72ba1243f610922954eaa9d79166e56eda393b9cf72ca63ea3d4b19f05132e99ad89276dc5bbcfc1bd0
 DIST kpeople-5.11.0.tar.xz 56612 SHA256 e1f75756b344d11784a59dd8a37346e8115e15e6c7fcfb7face6ee3277d2097f SHA512 9d944203e842a51153b2c346720c27b38fae984a378d54d9b898fe0066deaf46340a035e107127d950ea70169bf659a0a71e35613e8a8ba78c7b0e75bbcad7f5 WHIRLPOOL 3de05d2ec9c8cfe7a93b1e797a43663773c0ea9c8d31c9c2b3cc0f8554aae9a8978ca4421b8c59803479d2a6045d18da71706fd666fc0f5d3a3e3d6458344695
diff --git a/kde-frameworks/kpeople/kpeople-5.10.0.ebuild b/kde-frameworks/kpeople/kpeople-5.10.0.ebuild
deleted file mode 100644
index f2898087a63e..000000000000
--- a/kde-frameworks/kpeople/kpeople-5.10.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kpeople/kpeople-5.10.0.ebuild,v 1.2 2015/05/12 14:10:51 kensington Exp $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="KDE contact person abstraction library"
-HOMEPAGE="https://projects.kde.org/projects/frameworks/kpeople"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}
-	!net-libs/kpeople:5
-	!net-libs/libkpeople[-minimal(-)]
-"
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 307e96b3be75..5c1669b42570 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,2 +1 @@
-DIST kplotting-5.10.0.tar.xz 29196 SHA256 70eab2cb959495a8c6a35345d5fa14e50f72fc68a9d11bb430472f9b688df93c SHA512 0d723fef64d629af05f5f8d5aa9d59dde2a35bbec54f575f25e6993c12fcca29a931d291075075a92de2dfb25331fff4ae24b53e93b2652f9033fd6692a60497 WHIRLPOOL d3905160b540087cdc1c2fd40f659719effe3e75a00cdad66f7804fe2dfb263550515352c68779ef1447c10b1a114c9cf19138dbd9d3730466f5ed71b82e71b7
 DIST kplotting-5.11.0.tar.xz 29268 SHA256 8b52c26edebe608ed57b11f5d9b216cd36aa305492b825ff50f9803aa3d55cdc SHA512 d568ae0e59e55f1617608a89743c47eb9bd4ce7a7ea91e829ef4a5fe4afe161a5656de6f2cc196cfd6aa741d1a25143b5af9483bbb509b66d9dfcb4a2c9a540d WHIRLPOOL f73117ba180a3f2a4e32195f3c21bca531b8be547260b3006e834a72e674e695dde392fa5c70b3da47efb5b44f042c8110d5eabcb285dd1bbc4be9873ad6535e
diff --git a/kde-frameworks/kplotting/kplotting-5.10.0.ebuild b/kde-frameworks/kplotting/kplotting-5.10.0.ebuild
deleted file mode 100644
index dfaefca54117..000000000000
--- a/kde-frameworks/kplotting/kplotting-5.10.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kplotting/kplotting-5.10.0.ebuild,v 1.1 2015/05/09 10:36:05 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing easy data-plotting functions"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest
index 2530354519eb..d5fb3045d18e 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,2 +1 @@
-DIST kpty-5.10.0.tar.xz 57108 SHA256 a663dbf61848bbe5fa7e9adc8e64cfa353c1e1dc56fe26cd9466e708c3e648fb SHA512 e731ebaef4cd71c8500ff86b5bd16b9208d41a2f9aa87c8a3654daa81173ea888f593862cd6607acbdc857cac050c32a50a68f46f075d3e9e9e7ae50eef6d6a2 WHIRLPOOL c45524c119ba198eb1e9f5b9f0891015a66af2c095557a1b3d02ac7372416cb3cc07437dbc9275159f8c05e4ace185d8e74270a6edebfcea795317857529c6ee
 DIST kpty-5.11.0.tar.xz 57188 SHA256 47f1cb9621702a0ec3e633cbca863017c334c1ad1cd040d6b357224189112321 SHA512 66ffd479fd15afd55caf37927e4bc50404fc967838a1ca0ad6f3ca8a6287df069217e1d1e1dc18771131468162d4d7812c424ddb98b95c0dfc95df6cf1c3fc4d WHIRLPOOL fe6e28aadcdaa30ba19d9d22147c7844aa6a91d4935031a961aea433903a82e8de535f4d27059ecbdb74d36abaedd7cc54c5027ac1d71c50d41fc0a2dbe7f73a
diff --git a/kde-frameworks/kpty/kpty-5.10.0.ebuild b/kde-frameworks/kpty/kpty-5.10.0.ebuild
deleted file mode 100644
index 0067ed205a35..000000000000
--- a/kde-frameworks/kpty/kpty-5.10.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kpty/kpty-5.10.0.ebuild,v 1.1 2015/05/09 10:36:05 mrueg Exp $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework for pseudo terminal devices and running child processes"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	sys-libs/libutempter
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest
index 4777bbdbd316..d368b2812b89 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,2 +1 @@
-DIST kross-5.10.0.tar.xz 135108 SHA256 589a3ad81f378a44956f53d1cb2726d9144dcea9c0d9f5382f6a6e20123fbf0a SHA512 58b86a007e1427bfbe45f1cf2d93c11b108724d15107e3d59ea2f3ef21a363c1f2212a80e884cc9076933613e4fa2c462c69928d947791ade53d0a31e8603a66 WHIRLPOOL 518616a26eb207826f3a307810a77f55ba5c1b32407cd6cfb27f56ccf40b9dc94f6f7305500b0f3ea8e8b1b3d112684c7a93e476daad5c08d6c68070149675c2
 DIST kross-5.11.0.tar.xz 135208 SHA256 cffc117fcc5323e293f4a2dc0c587b101f1054b32f364e92884c9df76f09b129 SHA512 b9021d0c518233115adacbf1045824649be5a8bb6b504749f745962377714d48ee43a8fa2796c6b3ef7e17393db53d7a98e593c744e1a44bdd19647ac6246e06 WHIRLPOOL 1d9192a9ea6d7e287ad94c6965a6d1269b4699b604d83131d97bb958445ce0ac056e49c41cd0b887e10de6a8b6a752c5e5365cacce67e1f3d61d5c9251d603e3
diff --git a/kde-frameworks/kross/kross-5.10.0.ebuild b/kde-frameworks/kross/kross-5.10.0.ebuild
deleted file mode 100644
index 56a4692db809..000000000000
--- a/kde-frameworks/kross/kross-5.10.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kross/kross-5.10.0.ebuild,v 1.1 2015/05/09 10:36:06 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for embedding scripting into applications"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtgui:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	dev-qt/designer:5
-"
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index a5b5f16b3956..0e32b9dd0b13 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,2 +1 @@
-DIST krunner-5.10.0.tar.xz 39916 SHA256 9100a58a6c7fc043212b126aed2047f71de21ae7172957cf80461f01f5ef4d95 SHA512 28355473d3487a8492a47c6e2d0075a5f9037248d888b8e65252999b2bb94a3b735213955d9741abd60bba7a9da1a7fa24e73835af2add62e370d5d7ed5d13ff WHIRLPOOL 2b7a9020841abca586dc90ad8e5764a5324b7fc435cf23c3b551b83630a5ea77ac881fd50eb7b85ef2504f27599c14915ca593f4f6d049cb5c1ef291403a0989
 DIST krunner-5.11.0.tar.xz 48040 SHA256 83b3b6d77b953b6db397ced8636a8e0dbee780181cdaad07b80daaf778db6310 SHA512 895784860ec66bee3fe3886c000a82487a22fd5d13c79b2c43535397c808bc292475f412a0d32eb7188115590e1cbb8de731c349b7d0fb6433f4c1624b27432c WHIRLPOOL c13ac4e43435c3d8f2b31bb766e4f66090f2a28f1206d9d9f873d382b060c48e2f47c8eb9280a2155f41d6aecb04d86aa222aa43113e98cd917870462ed0eda4
diff --git a/kde-frameworks/krunner/krunner-5.10.0.ebuild b/kde-frameworks/krunner/krunner-5.10.0.ebuild
deleted file mode 100644
index 6478fe68e309..000000000000
--- a/kde-frameworks/krunner/krunner-5.10.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/krunner/krunner-5.10.0.ebuild,v 1.1 2015/05/09 10:36:06 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for providing different actions given a string query"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep threadweaver)
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest
index b60e57ccbf72..152ea371d57b 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,2 +1 @@
-DIST kservice-5.10.0.tar.xz 262972 SHA256 263711ba0e3e7602c8731cf8c79e816be479616b8180d56a614ac9d65073b595 SHA512 a2900f0a0a0ec05e72fb11ad3cfcadaa502e505e8f59d498d4905928e91235609a0e3d690929baf206f5fa8b30a7b84b5c6b750ed009d26766b9fabafeaffe7b WHIRLPOOL 2dbc0b03ce8f9e893fd4b94cd24ca9f8a3c4dd948b85f2bf5e0101e1e0f63bd063f258f80df9328569ca91da25a82d96e1c8267c3d06758ac7c5ee32c2b05cca
 DIST kservice-5.11.0.tar.xz 263956 SHA256 9234831923fc73fd4b8e7edd012e2776e7140fb37a215cc1894e66779d502a34 SHA512 44fdd4b688c960dfe99f2a0a0f48a52640bc0c2f17e3dbe0061d29186fed8aff9dda28d9e60e71cc3ee69696783aaa957bf4362007acce0aa3b7955838102377 WHIRLPOOL c17053606c2d99e3801396709035f5c541987927db0c9e928e7d67bf616952bfd85cd66893d4f637a2e46e8b4147cf2cbb7951f562310bb86bab6cd88e212b3b
diff --git a/kde-frameworks/kservice/kservice-5.10.0.ebuild b/kde-frameworks/kservice/kservice-5.10.0.ebuild
deleted file mode 100644
index 48afa3ac78f2..000000000000
--- a/kde-frameworks/kservice/kservice-5.10.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kservice/kservice-5.10.0.ebuild,v 1.1 2015/05/09 10:36:06 mrueg Exp $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework providing advanced features for plugins, such as file type association and locating"
-LICENSE="LGPL-2 LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	dev-qt/qtdbus:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	test? ( dev-qt/qtconcurrent:5 )
-"
-
-# requires running kde environment
-RESTRICT="test"
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 37e2cbec1886..23de123d21ef 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,2 +1 @@
-DIST ktexteditor-5.10.0.tar.xz 2799476 SHA256 10cecd7655d045b32d560cc0469d86978f8903f046a2ca3a14693c3a7710baab SHA512 f6d623d31e1e73d4c9b6cd2b5910f66f5e5e993622ec5037f3e772a24abf92cedf125b830c322b1b9161fb11e784dbf1d028d99948d21ec23938b03847cc4813 WHIRLPOOL 0fc6acc63157ed01a5d9d8d925f010d974db50a895ccd12a3469e0d59a4290aac26e0b41ef65dec426f80426de5a460340ba311e0ca86a7db18c62877ed119be
 DIST ktexteditor-5.11.0.tar.xz 2805484 SHA256 ea3f4cca398fae7b419c23c16572857fbaa9f602ff7658c087c1faa59bdc711d SHA512 56cae513bc51f80f9b9345f798ba3886c01aa4dd516dc441c6f25c06d9cd328859efc1978145d299648375f6a980325c9d326846cd0b98a876ec57607344cebc WHIRLPOOL f5482170df5b81c2bf35b0f6019a71d2eb332e08ea066d7f7067fed55f2e40e84914c4e6680ecd84b92ebb45a6ea173ebad94813cc0d4e7056f90b7cba6f0d53
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.10.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.10.0.ebuild
deleted file mode 100644
index 53f38dcc3a01..000000000000
--- a/kde-frameworks/ktexteditor/ktexteditor-5.10.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/ktexteditor/ktexteditor-5.10.0.ebuild,v 1.1 2015/05/09 10:36:07 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing a full text editor component"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="git"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	git? ( dev-libs/libgit2 )
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtxmlpatterns:5
-	test? ( $(add_frameworks_dep kservice) )
-"
-
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package git LibGit2)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest
index 4304db32adbf..00e20164782a 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,2 +1 @@
-DIST ktextwidgets-5.10.0.tar.xz 306124 SHA256 665701401815fc123d2ace5947c98ea696decf614589327a0b72c4e0ef8cfa56 SHA512 f6c03c829c833e9eb87d0b0f064b424c80c1032b02baaf4b553cba4a54ee2b459c13be2492fa8170315deba72a5283c027e64f160361380b4067b4b32ea5c8ea WHIRLPOOL fe1d4bab780ffc64b837a020ab17106fde57e43188b6f9cd3db1f842a6b0df0d6a5f148d6575d3fccddacd2d2d487dea24837fa31da60ac29cb296e3c6556efa
 DIST ktextwidgets-5.11.0.tar.xz 305684 SHA256 9018126f8d817051905080163ac69896a0394351a0822547245ffbe853be5f00 SHA512 9dd963a15c885bd2984e3dac37a347d785314ba5c5472312c08a76b3075dd370a611f0bf62afed7aae540ae869100be1399aaae7b03b1d13bd0b0492ea457f59 WHIRLPOOL c28560f6b83ed737448b9f79ae56bf48e243fbc9d7a73eeb1a837f8cc51ff1892142b91e6922fc3099f07f0eab6410bbbdeb6e85700e376fc6fed9dcd54bd535
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.10.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.10.0.ebuild
deleted file mode 100644
index 647821a5cc2e..000000000000
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.10.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/ktextwidgets/ktextwidgets-5.10.0.ebuild,v 1.1 2015/05/09 10:36:08 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text"
-LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep sonnet)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest
index 5d633f75e74a..da49eba55a44 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,2 +1 @@
-DIST kunitconversion-5.10.0.tar.xz 619424 SHA256 b76cf0f76682e708f9ec51d3eda6cd8f2d0d0a5e20f59d686276890ae3e6aa37 SHA512 c6095497b3675c09c33ab8bece9cd540f07a84d6841d1df1fc2d74cbaf22f130a85ba4f3c0859e29a1bac8bb73c323d1eb5a752c42948651001500adbbac4624 WHIRLPOOL b277a46aca477ce267b616f1a727b4f64b6105cb4d1c0f8bfcaa4b2790c5b38c282eb8d1e1b99edcca02a0d67fecf6f1a70f593b0cbb2999861e1efbbda157b5
 DIST kunitconversion-5.11.0.tar.xz 619772 SHA256 e2b803059875c8bfe71e6b5e097ceba50b9ea0fecb5175f311dd604df8ca526e SHA512 b720febd84bedc472cdc986b76fe927e8f49d0fc9bc58a7d45cd6149a1cac924afd019ce73f87eca182bb03bffb01165f3e81e3128d0ee5651361663cf071150 WHIRLPOOL f2bbc1510cbf764f8c07f11f380ba2b1b3ccc7d056eea5e6c4ed96a3c4fe97f20493e3a9dde4c7933a5fdb2e27a800647c1e7a6db7ed6b546c7c7c71188017f2
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.10.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.10.0.ebuild
deleted file mode 100644
index 8a9de708c7a1..000000000000
--- a/kde-frameworks/kunitconversion/kunitconversion-5.10.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kunitconversion/kunitconversion-5.10.0.ebuild,v 1.1 2015/05/09 10:36:07 mrueg Exp $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework for converting units"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep ki18n)
-	dev-qt/qtnetwork:5
-	dev-qt/qtxml:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest
index cac11b3f06be..aa5978226bfb 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,2 +1 @@
-DIST kwallet-5.10.0.tar.xz 267744 SHA256 245b411df91dea234941fc462399b67678e192b8ef20a5ace0cab50af5312b5b SHA512 3f830fe5afded2026bd5d3013d7014e95e14b3ad77e47f492c87b973bfb1ffa15c26183080b79101cc06de4e12040fa7c2f4578ddfbf89f93932d68341718061 WHIRLPOOL 7480d0eefe53cd13b001fcac575ad831b77790822e1e55ace9a23e7a31dbaa185c7560905c53c169d4918b3e0efc2540cc0f8dc25d600fd3c37d623120451d6a
 DIST kwallet-5.11.0.tar.xz 267768 SHA256 bf2489db87ff98644498145cb1c85c40ab79287b96fb4532ddfaaa7d183c2678 SHA512 c34c52b7c1b6600dfc594a6978adaf43bc4c1d55317de0baf1b271b66695f030e6bc88e00bee8680a59fde7d0d6f6b4b589fa2b47da4652675691b734ff32098 WHIRLPOOL b7548a6bdd50fabc4d11609b100ad919de08ff283172b876e63e53ff78b09334a7ac04ba27d4c324316cb8148fddf615774ea906cc68e0659f7d300d6bc019d2
diff --git a/kde-frameworks/kwallet/kwallet-5.10.0.ebuild b/kde-frameworks/kwallet/kwallet-5.10.0.ebuild
deleted file mode 100644
index 23748efcfdeb..000000000000
--- a/kde-frameworks/kwallet/kwallet-5.10.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kwallet/kwallet-5.10.0.ebuild,v 1.1 2015/05/09 10:36:05 mrueg Exp $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework providing desktop-wide storage for passwords"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	dev-libs/libgcrypt:0=
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest
index 7692f75217ba..3695bd4da1eb 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,2 +1 @@
-DIST kwidgetsaddons-5.10.0.tar.xz 2123952 SHA256 b0cedf6fb05e2ba32c61a345acb24d373f8790fb5315c1b0949f54a634ff2f31 SHA512 f191f6e392140ce55792544fc1733f0820a79539d92c3c5b623b21db80b1825f76094a26ace46556ef05327c65202cdcb4753f485902923e550ed1124917aceb WHIRLPOOL cd13366e61e492858512cbcac705a944778646ab2cd6258065ec15086b3640677c0e75e7f543b996a64e40f9df65e53aac6f5b01893b353a530e3932eb33b43c
 DIST kwidgetsaddons-5.11.0.tar.xz 2126100 SHA256 efe02842a3006ed3b92736c41b84ca8c07a403c6fe9a8de8ce21753332bb7af4 SHA512 23a7c991b3a0fe898354499830154f3bdb37d09702e9ed5918df40c64795515f7d7764330f407d227ffedfcf55f57893af7d0420bc3611d5b16c9597f342d915 WHIRLPOOL 38acba22495d8fce4ac289ae0e64381bb838c43de1f89cb2e17305704f7fd9f6d604b6519ec2d13aaf28a2a6e62f4517c78bc2a437713e72e490c05cbc6e03d3
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.10.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.10.0.ebuild
deleted file mode 100644
index 56ee7fce2e28..000000000000
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.10.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.10.0.ebuild,v 1.1 2015/05/09 10:36:06 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="An assortment of high-level widgets for common tasks"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-	test? ( dev-qt/designer:5 )
-"
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 17480faca451..d8eb8b894885 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,2 +1 @@
-DIST kwindowsystem-5.10.0.tar.xz 160672 SHA256 0ec79551cf3175ed359397951a35e3fa4b458765fb6c45ad456826c69a5f3d3f SHA512 c4f181eb6bb8b7afb0d992e989e1634261b9ab3265c6fca20f1b38598c92427b08d821cc5e09e08073c1e9ba51dc2f1905db76dd85d9293db654d2faa759093a WHIRLPOOL a2620e349e4c11c1cbf7e2cfe14f8c0a7453804752bfb5030b637017926c6d466dee7a2f902c17c8fb569c730d63020b2014536f346012ab12e60be607e80d67
 DIST kwindowsystem-5.11.0.tar.xz 160668 SHA256 9d8f80fa311f82b860e059c15211e5914353a35ce8d4a3353ddb41174528d33d SHA512 199a824dfd2cde667c00f37085fb36d7ecebdc86e5875a453567402d02edd675ce8bb9fd282de29ff6d25ffb2ba5f898afa9b2381a3cb0d55db565900e09a0e1 WHIRLPOOL b328c17fa96815fab9a795880aa2560ddcff78ad1aa820eff54ac7c63c3a9f59b2f6c18cd7b81fea7a188659e5c2696de081a1694e8b3fdec3d99bf3efbb970f
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.10.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.10.0.ebuild
deleted file mode 100644
index 0b455eeb2afc..000000000000
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.10.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kwindowsystem/kwindowsystem-5.10.0.ebuild,v 1.1 2015/05/09 10:36:07 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing access to certain properties and features of the window manager"
-LICENSE="LGPL-2+ MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="nls X"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	X? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXfixes
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-	X? ( x11-proto/xproto )
-"
-
-RESTRICT="test"
-
-DOCS=( "docs/README.kstartupinfo" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest
index 3f6d3734ace0..5cd17704572e 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,2 +1 @@
-DIST kxmlgui-5.10.0.tar.xz 862484 SHA256 ee86d47fa75083fc20dee1050e320118327fc3a42a498be441e28b7653a342d4 SHA512 2505a3adba1a95b263d76024eced61ad3af03dac26cecedda97d6b1ca27ae495152f62e84be450c39fa8b3b4a7c309b2b68088b94523189ead77be8e33baeb5b WHIRLPOOL 5c8e8b7788b574eb9f75b68844ac7fd047ba29a01a48bb2c5f20be449517f8f0f2159e0cbc55487627f034a5501c2a789a17bfa35763e176800d3a9bc3b8eef3
 DIST kxmlgui-5.11.0.tar.xz 862560 SHA256 dd6f430e80b954573745177a79c5726426241ceae7b33e07ac678da64c21c4a9 SHA512 fd20c3b4b8a5d2025d995cb84bca1cba9bcc4c7c3a4002bf7454cc783ee05c81b96525c52295b364780ba3ae555bff4891eecf8d56319e8358780b5456ff8f3f WHIRLPOOL eaba27999a0d24d90df63da26308631ee93ba0014363ea54efa60b13cda3d6a3e0e08196b0731698128181d50a9b3cf222fc7a971a56517d9b63a9f70ee714aa
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.10.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.10.0.ebuild
deleted file mode 100644
index 122887e68429..000000000000
--- a/kde-frameworks/kxmlgui/kxmlgui-5.10.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kxmlgui/kxmlgui-5.10.0.ebuild,v 1.1 2015/05/09 10:36:05 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
-KEYWORDS=" ~amd64 ~x86"
-LICENSE="LGPL-2+"
-IUSE="attica"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	attica? ( $(add_frameworks_dep attica) )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package attica KF5Attica)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kxmlrpcclient/Manifest b/kde-frameworks/kxmlrpcclient/Manifest
index ad53f659bb35..5d8a2c51951f 100644
--- a/kde-frameworks/kxmlrpcclient/Manifest
+++ b/kde-frameworks/kxmlrpcclient/Manifest
@@ -1,2 +1 @@
-DIST kxmlrpcclient-5.10.0.tar.xz 19876 SHA256 b133f209c71ed0d33f81ab19a790e84ee66199f3ccb64156ef2f75ce6fc75cb2 SHA512 f20dec4c2385a09f43d293611a81e3a13a92c712288b5871d00988046cbcc776b12eef96251af2757b82782351cbc9bf4db0d31f58dcbe4d370a0357b3375e75 WHIRLPOOL 7083b236c9f2d61a87b4ad454c38c8501d85cf816724cd94b5dac33563604d92f6bfddf02e0cdcc2ec6672cc8ae044a020e063dffbd30bb1eb0981914589e851
 DIST kxmlrpcclient-5.11.0.tar.xz 28096 SHA256 90b113e6638594912eb6b82092229b50c6c079ff18f4833a74ac4ecc4cd8d578 SHA512 c39cf9e6cee7441ef36a3f60498ad767e984ea11c2ad639dd7553fc74bd09104c2560239684c123b3b00f6b6700735e0df96dad68a02a5f4fa6ce4315cd7a7bc WHIRLPOOL ec62dbee558466dc896dc279890d378cae166b09e42fd4c211167b636cf1b8640eaaef6e1f7b210871ea2aab817996707ec54f6faab2ea5aa9610454130622de
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.10.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.10.0.ebuild
deleted file mode 100644
index 3f533e31fbda..000000000000
--- a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.10.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.10.0.ebuild,v 1.1 2015/05/09 10:36:06 mrueg Exp $
-
-EAPI=5
-
-KDE_DOXYGEN="true"
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Framework providing client-side support for the XML-RPC protocol"
-LICENSE="BSD-2"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	dev-qt/qtxml:5
-	!<kde-plasma/plasma-workspace-5.2.95
-"
-DEPEND="${RDEPEND}"
diff --git a/kde-frameworks/modemmanager-qt/Manifest b/kde-frameworks/modemmanager-qt/Manifest
index ccfdab10c6c8..b8bb8dd4f4e7 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,2 +1 @@
-DIST modemmanager-qt-5.10.0.tar.xz 98244 SHA256 81a60f280200bf03ebd220e0472db58715e3b35668ae4f54fb3cae48196210f2 SHA512 add5d85d3d3d160e7a33272ed68867c47cfd9f2d011d9739dd0af96b5eed2d40e77fc6933a181f9b2d47d0e0bbf4a82ef708f42ecfef3092fe839c4e5314e115 WHIRLPOOL e7c1e2d94030c84c8c09f28cc8bac1bac3aac118e2dc271a6f25401fcf06c395898cd00bff7d644c417183641798e14a2edbfcc807dc8ba966fc4d44ee6209d6
 DIST modemmanager-qt-5.11.0.tar.xz 98392 SHA256 4b9cdf8d8e911dc04688918985d3ee115a99e99f2456be61845e40343d63885e SHA512 a69fbb1e9a7441cac6f98a6f05802471f3d86051936321714397ac5115eb8f527c691b8337f2d1058fbf58db1cce92fc04a2c1c7bfc26e7fb9d17eb8c36fb477 WHIRLPOOL 60f67b9bb15ef518c44936210d646c8203e893b2b8e32cf7d97fb888fdd844e44ed716ddfca1a401a9426dafaa653d4de1d98c49832b917ea16a8b8fdecb6ae8
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.10.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.10.0.ebuild
deleted file mode 100644
index aa98440fa983..000000000000
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.10.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/modemmanager-qt/modemmanager-qt-5.10.0.ebuild,v 1.1 2015/05/09 10:36:07 mrueg Exp $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="ModemManager bindings for Qt"
-LICENSE="LGPL-2"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtdbus:5
-	dev-qt/qtxml:5
-	net-misc/modemmanager
-	!kde-plasma/libmm-qt
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index e363e6e1aab6..9d9b87c75087 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,2 +1 @@
-DIST networkmanager-qt-5.10.0.tar.xz 153212 SHA256 84499b448da272b3d0624619efb2f1ae63ee086ed674cf74af87ee9a01793e29 SHA512 c79a938c39e13b4d22b94faccdf7ccbc3df89a8a3c3e7c8f40c8d0b7fab96f43395a11ccd9dc383d88965a1174da5738e44cf9e20dfa3b475103a4e937dfdd87 WHIRLPOOL 4b741e60a9127effe1f4c5887d787a1c86e9f5741fa9b5fd52e358e2b7ce6be218ac422d557a4580a110234eb2dd9c41e038aac13aa4fd780de80a38d6ac978d
 DIST networkmanager-qt-5.11.0.tar.xz 153444 SHA256 5159520ffbf1540ed685fd47adaa35bd8f48008208269a2cac4c5a37dc1ae7f0 SHA512 4022b104207431455ad47bfb69da4066b8e225d482adb07c4fbec268f670ab4efcb4af3586547a205c62fbeb40096b4d3424c136a5d8a0cd8c44fed7432730d7 WHIRLPOOL a4c42f7b7ba2405a56a74c1f8266bc0c513167a35b130638e395c9a4c401f353c64bc8adce20ab2d1d59ba7eb3bd232c2a1aadd2314a937108334d111bb7bf68
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.10.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.10.0.ebuild
deleted file mode 100644
index 1cc4803a7c57..000000000000
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.10.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/networkmanager-qt/networkmanager-qt-5.10.0.ebuild,v 1.1 2015/05/09 10:36:07 mrueg Exp $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="NetworkManager bindings for Qt"
-LICENSE="LGPL-2"
-KEYWORDS=" ~amd64 ~x86"
-IUSE="teamd"
-
-RDEPEND="
-	dev-qt/qtdbus:5
-	dev-qt/qtnetwork:5
-	|| (
-		>=net-misc/networkmanager-0.9.10.0[consolekit,teamd=]
-		>=net-misc/networkmanager-0.9.10.0[systemd,teamd=]
-	)
-	!kde-frameworks/libnm-qt
-	!kde-plasma/libnm-qt
-	!net-libs/libnm-qt
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/kde-frameworks/plasma/Manifest b/kde-frameworks/plasma/Manifest
index 0af140a2e13b..847097b8d310 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,2 +1 @@
-DIST plasma-framework-5.10.0.tar.xz 4008996 SHA256 0a4944f1db4644d6ebb43af99423993146262d7322aa93954617f97c579f5428 SHA512 da4bf71b3919f69ec2e7c1d0133aafd4baaadc8330a8613706dcc417f68c128ad6bdd72f0d3650db319967b608d535f84cafbbf4c1e056778d947c7efcf1c34b WHIRLPOOL 6f2151186c143c929f25419d79a83f39a67f95cea8c068c11b7482c8085931c36f598a769bee82a043b6af5c9e32e70f45d7368557fa4afc210c3b97f8459181
 DIST plasma-framework-5.11.0.tar.xz 4009856 SHA256 d24328863453de054df7d34b2369315dbf609a8bea7cfb06c6cba482a5cff5ef SHA512 5c733f2eabeb30e3bd33d7babaa6cfbbbf17182a1b82992f44ee6baa0029fac96e93774ddbd618e4057b40162935002725da866b88cd2fb8d6a96c4024dea779 WHIRLPOOL 96d2f933a2a3605396028d76cfbfdbe88d5e15c5e3831d580c85c0679cfa847b5a15bfc0438d9306aadc50bb03746cffda215e3190c67ec79210c2d3262d9485
diff --git a/kde-frameworks/plasma/plasma-5.10.0.ebuild b/kde-frameworks/plasma/plasma-5.10.0.ebuild
deleted file mode 100644
index 8b2cf5998512..000000000000
--- a/kde-frameworks/plasma/plasma-5.10.0.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/kde-frameworks/plasma/plasma-5.10.0.ebuild,v 1.2 2015/06/11 16:09:40 johu Exp $
-
-EAPI=5
-
-KMNAME="${PN}-framework"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plasma framework"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="egl opengl X"
-
-RDEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	egl? ( media-libs/mesa[egl] )
-	opengl? (
-		dev-qt/qtgui:5[opengl(+),-gles2]
-		virtual/opengl
-	)
-	X? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libxcb
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	dev-qt/qtquick1:5
-	X? ( x11-proto/xproto )
-"
-
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		$(cmake-utils_use_find_package X X11)
-		$(cmake-utils_use_find_package X XCB)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/solid/Manifest b/kde-frameworks/solid/Manifest
index 499d15bf451f..c0b0776d4f81 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,2 +1 @@
-DIST solid-5.10.0.tar.xz 265208 SHA256 c4a03cc4d9f3f72489371d8bf64ca3f2478d2a3603f240af60cec934585cc3e3 SHA512 a68c69b0fb10e1b0a94490cfa6c4e735c5a7615228d6f49e323ca71646ee5949ba9122264e0fdff7115a292f2953a088fc2bb15c41b31f6e21e4637c745b91d2 WHIRLPOOL ae4feaf994bb2189e6ae7fc0c182c51f159b4bb60c6421ef57d900136fa9497ce5f467116544da97cb780f46e814ae220e2a522fdf3a144d82861d8bf1d692ab
 DIST solid-5.11.0.tar.xz 265276 SHA256 c7a8832fb7f34584e23d08d7dfdf44a7270a2cba8244ef4d609bfbe2c958408a SHA512 01a6ae9e8f67bbffd57a0122254c64787394715281d4eb32376f72fb031424f376aecffc6238390882038f8981a1b8f06ae74d3422fe4908a40005e54f804a23 WHIRLPOOL c375735a80963c6ded939e386149d2b97787aa049de89047352d260affee4aee051fc37bc2e5f0858b2b38cf9b53bbfd54e2f424fa9f81d2ee437b1e4e1fe65f
diff --git a/kde-frameworks/solid/solid-5.10.0.ebuild b/kde-frameworks/solid/solid-5.10.0.ebuild
deleted file mode 100644
index d388b43221fa..000000000000
--- a/kde-frameworks/solid/solid-5.10.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/solid/solid-5.10.0.ebuild,v 1.1 2015/05/09 10:36:07 mrueg Exp $
-
-EAPI=5
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing platform independent hardware discovery, abstraction, and management"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	virtual/udev
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-	test? ( dev-qt/qtconcurrent:5 )
-"
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "app-misc/media-player-info" ; then
-		einfo "For media player support, install app-misc/media-player-info"
-	fi
-}
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index 5917e2122330..0d3f6b555d1c 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,2 +1 @@
-DIST sonnet-5.10.0.tar.xz 273408 SHA256 23cdf79966bec478c0932a37647e1560457b4da76a4dc9371962f2466b01a2a9 SHA512 ebb9f97e68a207a3353eb770871625587af8f473efd58796895a905e72a18412e5faf550e6121569f57f3fceb146ecdaab93eeb4cbb65e745582a321039479f3 WHIRLPOOL a2cbf09176f57f6208523688621c95def1625cf243cdde04e3deaf6f8bfd0700a7e0127af28df610fa2538cf45d4dccb98e29fc13d9d4ed40e155c7cdef071a9
 DIST sonnet-5.11.0.tar.xz 274160 SHA256 e37e44ea944038fee0d57bec1aebd39d20b4247c0b752e2741854e90597611d9 SHA512 055ebfd78d2b041ea6a235c7da222d4e7abd2c80b9554abfaf659cd53e68a9f1a88d843986c7d97b392b87e5c56689bc3cd4ca2a566ed29e355486926b8c15c8 WHIRLPOOL afecde64cdc6c296c3ec198a777e6c44d587276a9108e96abc94762bf5caf31edb6c5d5f78ca14a4dbeea56bd0fb43f56c39e48938488ec6523ad098e1f3c719
diff --git a/kde-frameworks/sonnet/sonnet-5.10.0.ebuild b/kde-frameworks/sonnet/sonnet-5.10.0.ebuild
deleted file mode 100644
index 3ae231490b0a..000000000000
--- a/kde-frameworks/sonnet/sonnet-5.10.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/sonnet/sonnet-5.10.0.ebuild,v 1.2 2015/05/19 13:29:18 kensington Exp $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework for providing spell-checking capabilities through abstraction of popular backends"
-LICENSE="LGPL-2+ LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE="+aspell hunspell nls"
-
-RDEPEND="
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	aspell? ( app-text/aspell )
-	hunspell? ( app-text/hunspell )
-"
-DEPEND="${RDEPEND}
-	nls? ( dev-qt/linguist-tools:5 )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package aspell)
-		$(cmake-utils_use_find_package hunspell)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/threadweaver/Manifest b/kde-frameworks/threadweaver/Manifest
index e1e235e4e858..d01ed3afa381 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,2 +1 @@
-DIST threadweaver-5.10.0.tar.xz 1408480 SHA256 cdceb275af60939fcfc80956398bdb313dfd543581bce127be72cb8c6ceccdd1 SHA512 e41d2b149586dfd2f4c8ee8242ac9efcd91ac7108fd304e8dceb8de4bc92a9975739df2c8a45603b65395ab5349a908e37fa970e6b1ae861b6744a4423b384db WHIRLPOOL 0451318ceebbc24d75ee724dab1988ae7f8da1b616e99440d01fdc70da219e8222875777249ccffe5e78cc776dd3dd99dac8b847f25640bcd356f2aff57d9f0c
 DIST threadweaver-5.11.0.tar.xz 1408556 SHA256 5ffca756f146825b5daaf1a29cec7947786cf967041c669dccd72c148cfdd9a8 SHA512 5819f834a0765fb8457e87abda012cbe247ba52e05eb9ca3892f10ddae0f3a9a58077d79b4ab53a82755a0b334735b85b65ce4cb903d5b04cb39804618d34e9a WHIRLPOOL 778764f8913a82691b0bc200d05e816a604d11f0b712ae03fe442c747f117ded00d25c16e169b09a4478590cd71fc02ba58d1aac16aba2bf17f7740e3900eda3
diff --git a/kde-frameworks/threadweaver/threadweaver-5.10.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.10.0.ebuild
deleted file mode 100644
index c9f6e17181d4..000000000000
--- a/kde-frameworks/threadweaver/threadweaver-5.10.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-frameworks/threadweaver/threadweaver-5.10.0.ebuild,v 1.1 2015/05/09 10:36:04 mrueg Exp $
-
-EAPI=5
-
-inherit kde5
-
-DESCRIPTION="Framework for managing threads using job and queue-based interfaces"
-LICENSE="LGPL-2+"
-KEYWORDS=" ~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	comment_add_subdirectory benchmarks
-	kde5_src_prepare
-}
diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest
index d6870e72ed4f..d9caebbfa65d 100644
--- a/kde-misc/wacomtablet/Manifest
+++ b/kde-misc/wacomtablet/Manifest
@@ -1,2 +1 @@
-DIST 114856-wacomtablet-2.0.2.tar.xz 620288 SHA256 1c0ac8d26be62954ca4ed67ab84337e95686e14c722822e85baca8797b71658e SHA512 5d4ead2dfc951dc3370c1ec49f713df780632dcd47c7c64e1d9788125d5ebf9fe000f5ac2199974a554fa851bea61374175b77dffa92ded08e45456fd3886688 WHIRLPOOL c85bea48d6625b0c9b06648b5f75fdf32eb50d9d73430fc9a8d81dcc2f8bfed477f8ab471f10f91536ac861a2be9fa6d09b74f0837ccf706d5381e0bf5570ac4
 DIST 114856-wacomtablet-2.1.0.tar.xz 657868 SHA256 1c4d0e9bf593b9ac99f0c2f1efae81b665cb07f5778486273ca1742f76b9c19e SHA512 fe8060120d63209bbe2adcb1c3f746086326f893ef1eaa879e0d0f843e9ba27fbbd3df5f9bf008dfc6e2dac0f1347ecc0b2bb46931646c82aaec9bfc6bc62a96 WHIRLPOOL f705be2dfe64a410f83e9acd1ec9b4f4cb58e24fbea2c3bbeadcae17dfb9bf58ce579b8040b002c2d4eb42b89e65a52f54c3c6a3fa77e8b29897a024bf7ade1b
diff --git a/kde-misc/wacomtablet/wacomtablet-2.0.2.ebuild b/kde-misc/wacomtablet/wacomtablet-2.0.2.ebuild
deleted file mode 100644
index 6157d631531d..000000000000
--- a/kde-misc/wacomtablet/wacomtablet-2.0.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/wacomtablet/wacomtablet-2.0.2.ebuild,v 1.4 2014/11/03 09:42:02 ago Exp $
-
-EAPI=5
-
-KDE_LINGUAS="ar bg bs ca ca@valencia cs da de el en_GB eo es et fi fr ga gl hu ja kk km ko lt mai mr nb nds nl pa pl
-pt pt_BR ro ru sk sl sv tr ug uk zh_CN zh_TW"
-KDE_DOC_DIRS="doc/user"
-KDE_HANDBOOK="optional"
-VIRTUALX_REQUIRED="test"
-inherit kde4-base
-
-DESCRIPTION="KControl module for Wacom tablets"
-HOMEPAGE="http://kde-apps.org/content/show.php?action=content&content=114856"
-SRC_URI="http://www.kde-apps.org/CONTENT/content-files/114856-${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug"
-
-RDEPEND="
-	>=x11-drivers/xf86-input-wacom-0.20.0
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libXrandr
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	x11-proto/xproto
-"
diff --git a/kde-misc/wacomtablet/wacomtablet-2.1.0.ebuild b/kde-misc/wacomtablet/wacomtablet-2.1.0.ebuild
index 3f421453a6ee..723ec04586e3 100644
--- a/kde-misc/wacomtablet/wacomtablet-2.1.0.ebuild
+++ b/kde-misc/wacomtablet/wacomtablet-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/kde-misc/wacomtablet/wacomtablet-2.1.0.ebuild,v 1.1 2015/03/04 10:56:42 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/wacomtablet/wacomtablet-2.1.0.ebuild,v 1.3 2015/06/28 10:06:28 zlogene Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ SRC_URI="http://www.kde-apps.org/CONTENT/content-files/114856-${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 RDEPEND="
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index 69e995047fa2..b8246a9bf610 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1,2 +1,2 @@
+DIST geary-0.10.0.tar.xz 917376 SHA256 46197a5a1b8b040adcee99082dbfd9fff9ca804e3bf0055a2e90b13214bdbca5 SHA512 9126acb3608f7aac9236f7d38f5ca549fe04427e244bbff093d06095e09d0ae642ed8e5722325f152a40d3c642a5f31035fca1685749fbe311c4bf3965ee3256 WHIRLPOOL 5d79011682cb47299a147f44380341c05b997b1c825f86df53772be8fcf3818eca85eb55aa325e8c6a6737024166d58044ab01298476a5dad5036092d5a17f74
 DIST geary-0.6.3.tar.xz 791248 SHA256 2fa2612bf3821f8ff74664463a430729776f6f9bf31795156be2ca7959b52eca SHA512 4a4f26b3e88032191f2b683d8ed0d48401b278c4d1cc69c09731d9ca878450847a35c0653a8b9907ce81b989e713d1a41a40b7b6193f6e84a6e6f4eb4d5053f4 WHIRLPOOL 83e4a648a792639a10fde6eccf78db2fb582ebea4f5f0806091e4cc9f8550387e976e46b383b33819b32a25ec665116cfecfa3417acb72950f1eba3ffa48d403
-DIST geary-0.8.2.tar.xz 833616 SHA256 3cfa626168935acf49c9415fad54c7849f17fd833026cfd3c224ba0fb892d641 SHA512 f6fa0583f4d78970e8f237f6df193ceb4bd353e263bcded5d6c27458502e7e299bdcd29c709c34e1dde26ccdad05ca95b6c3920e402c3796e5384308886e8924 WHIRLPOOL ce8723222ac8a756738903b757fed65c81a27d8e948907e4958cdc031cfb474ab675eeee65ec249271bb3a1bf7e0b2f5285f2920c6aab5ea502d62d004af3ce9
diff --git a/mail-client/geary/geary-0.8.2.ebuild b/mail-client/geary/geary-0.10.0.ebuild
similarity index 56%
rename from mail-client/geary/geary-0.8.2.ebuild
rename to mail-client/geary/geary-0.10.0.ebuild
index ae56c0801013..41897a7a0fb5 100644
--- a/mail-client/geary/geary-0.8.2.ebuild
+++ b/mail-client/geary/geary-0.10.0.ebuild
@@ -1,18 +1,16 @@
-# 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/mail-client/geary/geary-0.8.2.ebuild,v 1.2 2014/12/24 16:37:21 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/geary-0.10.0.ebuild,v 1.2 2015/06/27 09:51:16 pacho Exp $
 
 EAPI=5
-
+GCONF_DEBUG="no"
 VALA_MIN_API_VERSION=0.22
 
-inherit eutils fdo-mime gnome2-utils vala cmake-utils
+# Keep cmake-utils at the end
+inherit eutils fdo-mime gnome2 vala cmake-utils
 
-MY_P=${P/_pre/pr}
 DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
-HOMEPAGE="http://www.yorba.org/projects/geary/"
-# FIXME: Possibly use gnome.org.eclass?
-SRC_URI="mirror://gnome/sources/geary/${PV:0:3}/${MY_P}.tar.xz"
+HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
@@ -30,25 +28,31 @@ DEPEND="
 	media-libs/libcanberra
 	>=net-libs/webkit-gtk-1.10.0:3[introspection]
 	>=x11-libs/gtk+-3.10.0:3[introspection]
-	x11-libs/libnotify"
+	x11-libs/libnotify
+"
 RDEPEND="${DEPEND}
 	gnome-base/gsettings-desktop-schemas
-	nls? ( virtual/libintl )"
+	nls? ( virtual/libintl )
+"
 DEPEND="${DEPEND}
 	app-text/gnome-doc-utils
 	dev-util/desktop-file-utils
 	nls? ( sys-devel/gettext )
 	$(vala_depend)
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 DOCS=( AUTHORS MAINTAINERS README NEWS THANKS )
 
-S=${WORKDIR}/${MY_P}
-
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.7.2-cflags.patch \
-		"${FILESDIR}"/${PN}-0.5.3-vapigen.patch \
-		"${FILESDIR}"/${PN}-0.6.0-desktopfile.patch
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751556
+	epatch "${FILESDIR}"/${PN}-0.7.2-cflags.patch
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751557
+	epatch "${FILESDIR}"/${PN}-0.5.3-vapigen.patch
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751558
+	epatch "${FILESDIR}"/${PN}-0.6.0-desktopfile.patch
 
 	local i
 	if use nls ; then
@@ -64,6 +68,7 @@ src_prepare() {
 	fi
 
 	cmake-utils_src_prepare
+	gnome2_src_prepare
 	vala_src_prepare
 }
 
@@ -79,24 +84,3 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	elog "For libnotify sounds you will need"
-	elog "\"alsa\" or \"pulseaudio\" useflag of media-libs/libcanberra"
-	elog "enabled."
-
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/mail-client/geary/metadata.xml b/mail-client/geary/metadata.xml
index e96e35b1a37c..e98dd9082dc1 100644
--- a/mail-client/geary/metadata.xml
+++ b/mail-client/geary/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
+<herd>gnome</herd>
 </pkgmetadata>
 
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 145858625234..86fa815b986f 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,3 +1,4 @@
 DIST gmic_1.6.0.2.tar.gz 3013936 SHA256 ec9fa41bb8c27f883b9f845258d41f8024936c80bdec723a1c67cfe05ef9b900 SHA512 9d754cc2c72835bd139a39f72863f5315bebc25716efadb023f54661a4bb3fbf29066ddcd258ab8f084164edc9bd02f77a5a801b5c0753322f959205ce0adaf1 WHIRLPOOL 1d8e7126901b7a269f0aae9bdc1bd05a859efa3269de892e712892aa0c06eeb856c27cf05564bac30abcacf27f3e11d2bcc8f179fc29a675960d6640567cdc0c
 DIST gmic_1.6.0.3.tar.gz 3019692 SHA256 91ce6cfe58e29a6819bf849346bf049d2d73f826bbd7b8b8de42dae7d54c7752 SHA512 377b361fc178ab73a7542a39243d32de970ad6ec5928c295d86acf1bd67efc2ebaf72ce818b55c6a7aeda17eb657fbf4176f4f4c90bc48179419842343e3619b WHIRLPOOL fb78366cd72467b2c1ac2e3f704061be173ba28cb888dabee56f7c4c7c2a4b870293c2e1ae88c87edad8f4e511944bb99218e9fae2d30226c1a4b07b001927f6
 DIST gmic_1.6.0.4.tar.gz 3073596 SHA256 ef83e4efc31280e819d02315b1ebbaec6c0b8ebb960da3e785651572853b8f58 SHA512 75c0adc8a0460c140ec656403053e4533fc6434a0b23c2ac842045aeb788a8ce5da5338832574e76e06fd710bebf5ec627a5bc894f00081ffd1b37a5c6aa852e WHIRLPOOL 1eb3afc6c9fb9c07999e5e497e6d6c5075fda46293417e889511c28c9e0ce26b0070e1356dcf0db9bb49e76b83d75941ed917c01b61c98ab537430ea938c831d
+DIST gmic_1.6.5.0.tar.gz 3005945 SHA256 ebc98c4f5848b8343d581104e072299529ac3edbcea7b565ffd6e1fb4bfd66ed SHA512 3feb5589dcc341106ce1305ce2d3f90776f074607bec3b8413519aa5f2c9dc9554a9ee7a5ba1d52d1a9e7676e6bff135d444276c989511f973cd456136d0e4e1 WHIRLPOOL 02f3f711fa9c876fba39e56a42c30f62a6c2d0848ae836f9635d7df0ef57f48f2a8f09ca361232c2239e473046fe7d085260ac365d2e7b6d49e65c3c0aa2e9bc
diff --git a/media-gfx/gmic/files/gmic-1.6.5.0-makefile.patch b/media-gfx/gmic/files/gmic-1.6.5.0-makefile.patch
new file mode 100644
index 000000000000..91e7528ae850
--- /dev/null
+++ b/media-gfx/gmic/files/gmic-1.6.5.0-makefile.patch
@@ -0,0 +1,154 @@
+--- gmic-1.6.5.0/src/Makefile
++++ gmic-1.6.5.0/src/Makefile
+@@ -85,7 +85,6 @@
+ ifndef NO_STDLIB
+ MANDATORY_CFLAGS += -std=c++11
+ endif
+-MANDATORY_LIBS += -L$(USR)/$(LIB)
+ ifeq ($(notdir $(CC)),g++)
+ MANDATORY_CFLAGS += -Wall -W
+ MANDATORY_LIBS += -lm
+@@ -139,14 +138,14 @@
+ # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
+ # This requires the presence of the X11 include and library files.
+ # (package 'libx11-dev' on Debian).
+-X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
+-X11_LIBS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr
++X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr
++X11_LIBS = -lX11 -lpthread #-lXrandr
+ 
+ # Flags to enable fast display, using XShm.
+ # This requires the presence of the X11 extension include and library files.
+ # (package 'libx11-dev' on Debian).
+ XSHM_CFLAGS = -Dcimg_use_xshm
+-XSHM_LIBS = -L$(USR)/X11R6/lib -lXext
++XSHM_LIBS = -lXext
+ 
+ # Flags to enable image display, using GDI32.
+ # This requires the presence of the GDI32 include and library files.
+@@ -174,8 +173,8 @@
+ # Flags to enable native support for MINC2 image files, using the MINC2 library.
+ # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )
+ # (package 'libminc-dev' on Debian).
+-MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include
+-MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
++MINC2_CFLAGS = -Dcimg_use_minc2
++MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz
+ 
+ # Flags to enable native support for downloading files from the network.
+ # ( http://curl.haxx.se/libcurl/ )
+@@ -325,7 +324,6 @@
+ 
+ cli:
+ 	$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
+-	strip gmic$(EXE)
+ 
+ gimp:
+ 	$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS)" gmic_gimp
+@@ -335,11 +333,9 @@
+ 
+ gmicol:
+ 	$(MAKE) "CFLAGS+=$(STD_GMICOL_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GMICOL_LIBS)" gmic
+-	strip gmic$(EXE)
+ 
+ static:
+ 	$(MAKE) "CFLAGS+=$(STATIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STATIC_CLI_LIBS)" gmic
+-	strip gmic$(EXE)
+ 
+ debug:
+ 	$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
+@@ -355,24 +351,22 @@
+ libgmic.o: gmic.cpp gmic.h gmic_def.h CImg.h
+ 	$(CC) -o libgmic.o -c gmic.cpp -fPIC $(CFLAGS)
+ 
+-libgmic: libgmic.o gmic_use_lib.cpp
+-	ar rcs libgmic.a libgmic.o
++libgmic: libgmic.o
++	$(AR) rcs libgmic.a libgmic.o
+ ifeq ($(OS),Darwin)
+-	$(CC) -shared -o libgmic.so libgmic.o $(LIBS)
++	$(CC) $(LDFLAGS) -shared -o libgmic.so libgmic.o $(LIBS)
+ else
+-	$(CC) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so libgmic.o $(LIBS)
+-	$(CC) -o gmic_use_lib gmic_use_lib.cpp -L. -lgmic
++	$(CC) $(LDFLAGS) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so libgmic.o $(LIBS)
+ endif
+ 
+ gmic_gimp.o: gmic.cpp gmic.h gmic_def.h CImg.h
+ 	$(CC) -o gmic_gimp.o -c gmic.cpp -Dgmic_gimp $(CFLAGS)
+ 
+ gmic_gimp : gmic_gimp.o gmic_gimp.cpp
+-	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS)
+-	strip gmic_gimp$(EXE)
++	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) $(LDFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS)
+ 
+ gmic: gmic.cpp gmic.h gmic_def.h CImg.h
+-	$(CC) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LIBS)
++	$(CC) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LDFLAGS) $(LIBS)
+ 
+ gmic_def.h:
+ 	@wget --quiet -O gmic_def.h http://gmic.eu/gmic_def.h
+@@ -397,38 +391,43 @@
+ # Generate bash completion script (requires 'gmic' to be installed first).
+ bashcompletion:
+ 	@mkdir -p ../resources
+-	@\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh
++	@./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh
+ 
+ # Generate man page (requires 'gmic' to be installed first).
+ man:
+ 	@mkdir -p ../man
+-	@\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1
+-	@gzip -f ../man/gmic.1
++	@./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1
+ 
+ # Install/uninstall/clean procedures.
+-install:
++install-gimp:
+ 	mkdir -p $(DESTDIR)$(PLUGINDIR)/
+ 	cp -f gmic_gimp $(DESTDIR)$(PLUGINDIR)/
++
++install-bin:
+ 	mkdir -p $(DESTDIR)$(USR)/$(BIN)/
+ 	cp -f gmic $(DESTDIR)$(USR)/$(BIN)/
++
++install-lib:
+ 	mkdir -p $(DESTDIR)$(USR)/$(INCLUDE)/
+ 	cp -f gmic.h $(DESTDIR)$(USR)/$(INCLUDE)/
+-
+ ifneq ($(OS),Darwin)
+ 	mkdir -p $(DESTDIR)$(USR)/share
+ 	mkdir -p $(DESTDIR)$(USR)/$(LIB)
+ 	cp -f libgmic.so $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.6.5
+ 	ln -fs libgmic.so.1.6.5 $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
+ 	ln -fs libgmic.so.1 $(DESTDIR)$(USR)/$(LIB)/libgmic.so
+-	cp -f ../zart/zart $(DESTDIR)$(USR)/$(BIN)/
+ endif
++
++install-zart:
++	cp -f ../zart/zart $(DESTDIR)$(USR)/$(BIN)/
++
++install-man:
+ 	mkdir -p $(DESTDIR)$(USR)/share/man/
+ 	mkdir -p $(DESTDIR)$(USR)/share/man/man1/
+-	mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
+-	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
+-	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
++	cp -f ../man/gmic.1 $(DESTDIR)$(USR)/share/man/man1/gmic.1
++
++install-bash:
+ 	if [ -d /etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi
+-	if [ -d /opt/local/etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)$(USR)/$(BIN)/gmic
+@@ -438,8 +437,7 @@
+ 	rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
+ 	rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so
+ 	rm -rf $(DESTDIR)$(USR)/share/doc/gmic/
+-	rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
+-	rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
++	rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1
+ 
+ distclean: clean
+ 
diff --git a/media-gfx/gmic/gmic-1.6.5.0.ebuild b/media-gfx/gmic/gmic-1.6.5.0.ebuild
new file mode 100644
index 000000000000..f576d6a84ccd
--- /dev/null
+++ b/media-gfx/gmic/gmic-1.6.5.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gmic/gmic-1.6.5.0.ebuild,v 1.3 2015/06/27 03:23:19 radhermit Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs bash-completion-r1 flag-o-matic
+
+DESCRIPTION="GREYC's Magic Image Converter"
+HOMEPAGE="http://gmic.eu/"
+SRC_URI="http://gmic.eu/files/source/${PN}_${PV}.tar.gz"
+
+LICENSE="CeCILL-2 FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ffmpeg fftw graphicsmagick jpeg opencv openexr openmp png tiff X zlib"
+
+DEPEND="
+	fftw? ( sci-libs/fftw:3.0[threads] )
+	graphicsmagick? ( media-gfx/graphicsmagick )
+	jpeg? ( virtual/jpeg:0 )
+	opencv? ( >=media-libs/opencv-2.3.1a-r1 )
+	openexr? (
+		media-libs/ilmbase
+		media-libs/openexr
+	)
+	png? ( media-libs/libpng:0= )
+	tiff? ( media-libs/tiff:0 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	ffmpeg? ( media-video/ffmpeg:0 )
+"
+
+S=${WORKDIR}/${P}/src
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+
+	for i in fftw jpeg opencv openmp png tiff zlib ; do
+		use $i || { sed -i -r "s/^(${i}_(CFLAGS|LIBS) =).*/\1/I" Makefile || die ; }
+	done
+
+	use graphicsmagick || { sed -i -r "s/^(MAGICK_(CFLAGS|LIBS) =).*/\1/" Makefile || die ; }
+	use openexr || { sed -i -r "s/^(EXR_(CFLAGS|LIBS) =).*/\1/" Makefile || die ; }
+
+	if ! use X ; then
+		sed -i -r "s/^((X11|XSHM)_(CFLAGS|LIBS) =).*/\1/" Makefile || die
+
+		# disable display capabilities when X support is disabled
+		append-cxxflags -Dcimg_display=0
+	fi
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" \
+		LIB="$(get_libdir)" OPT_CFLAGS= DEBUG_CFLAGS= cli lib
+	emake man bashcompletion
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIB="$(get_libdir)" install-bin install-lib install-man install-bash
+	dodoc ../README
+}
diff --git a/media-gfx/potrace/potrace-1.12.ebuild b/media-gfx/potrace/potrace-1.12.ebuild
index 25a3b00f3407..8e13a0564d7d 100644
--- a/media-gfx/potrace/potrace-1.12.ebuild
+++ b/media-gfx/potrace/potrace-1.12.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/potrace/potrace-1.12.ebuild,v 1.6 2015/06/24 07:54:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/potrace/potrace-1.12.ebuild,v 1.7 2015/06/27 12:44:31 maekke Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ SRC_URI="http://potrace.sourceforge.net/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="metric static-libs"
 
 RDEPEND="sys-libs/zlib"
diff --git a/media-gfx/shotwell/shotwell-0.22.0.ebuild b/media-gfx/shotwell/shotwell-0.22.0.ebuild
index b1dfd96315bc..537feb24fb52 100644
--- a/media-gfx/shotwell/shotwell-0.22.0.ebuild
+++ b/media-gfx/shotwell/shotwell-0.22.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-gfx/shotwell/shotwell-0.22.0.ebuild,v 1.1 2015/04/07 14:20:19 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/shotwell/shotwell-0.22.0.ebuild,v 1.2 2015/06/26 14:28:38 ago Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 CORE_SUPPORTED_LANGUAGES="
diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index 856d0af03808..1bc5165f713c 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -1,2 +1,3 @@
 DIST ufraw-0.20.tar.gz 1086969 SHA256 6dcd30f73238f56641ec87ae07807a6ebeab141a1a481aafe3ddab6f3db8a1e0 SHA512 d18ecc257f9d88c77fca0e7a8641ee1e78abd28e73c34bd98def2d0dbd65f8fbaa677deca34ac4ed3ce7775764b6baca2896a023d690573057e4659de6dc3b1a WHIRLPOOL fedecf66ef22bdffe667408ac0b8106ec99ee2a1dd29fab53877229ec375bdeab37cc6fe942d7e3ef2c3de38a5770eaf4f49c44367ca1677acfda13bb4c85a1d
 DIST ufraw-0.21.tar.gz 1016298 SHA256 2a6a1bcc633bdc8e15615cf726befcd7f27ab00e7c2a518469a24e1a96964d87 SHA512 e1fbfcf7b6f15089d51626a3e2d3dc694aa79edfc0bdfe4a8be6f684d4a31a91c56502942174c0708de91413fe907acb5d2fa2ad9d1a5404eb66b14764909ae9 WHIRLPOOL 84e96894f9ecc9d3a81f96f7c58165e095553b9bab69343754c8a89ef18480f751745cb48e8846ea5db26d1077ace4104ef18d0c0546b2b54439819b81ee3a7c
+DIST ufraw-0.22.tar.gz 1103554 SHA256 f7abd28ce587db2a74b4c54149bd8a2523a7ddc09bedf4f923246ff0ae09a25e SHA512 a42eff5052c18afec90245cf97ceeade78e3f288186cf697ac4abf2e8290d4081db8ac4de3ae47b3774f30a6cb4cbda392099e6fd2125fe751abb40d9b065ad2 WHIRLPOOL 5cb53f83d2f2baccd0752a0898eb894b8e15ad234962f3e3cc4ae2166309cd68893dceef28d32018aa486da1a09c64df378a2569f764a42f8251f5a568c14e5f
diff --git a/media-gfx/ufraw/ufraw-0.22.ebuild b/media-gfx/ufraw/ufraw-0.22.ebuild
new file mode 100644
index 000000000000..a6f16b803009
--- /dev/null
+++ b/media-gfx/ufraw/ufraw-0.22.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ufraw-0.22.ebuild,v 1.1 2015/06/27 12:45:01 maekke Exp $
+
+EAPI=5
+inherit autotools eutils fdo-mime gnome2-utils toolchain-funcs
+
+DESCRIPTION="RAW Image format viewer and GIMP plugin"
+HOMEPAGE="http://ufraw.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="contrast fits gimp gnome gtk openmp timezone"
+
+REQUIRED_USE="gimp? ( gtk )"
+
+RDEPEND="
+	dev-libs/glib:2=
+	>=media-gfx/exiv2-0.11:0=
+	media-libs/lcms:2=
+	>=media-libs/lensfun-0.2.5:=
+	media-libs/libpng:0=
+	media-libs/tiff:0=
+	virtual/jpeg:0=
+	fits? ( sci-libs/cfitsio:0= )
+	gnome? ( >=gnome-base/gconf-2 )
+	gtk? ( >=x11-libs/gtk+-2.6:2
+		>=media-gfx/gtkimageview-1.5 )
+	gimp? ( >=media-gfx/gimp-2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable contrast) \
+		$(use_with fits cfitsio) \
+		$(use_with gimp) \
+		$(use_enable gnome mime) \
+		$(use_with gtk) \
+		$(use_enable openmp) \
+		$(use_enable timezone dst-correction)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" schemasdir=/etc/gconf/schemas install
+	dodoc README TODO
+}
+
+pkg_preinst() {
+	if use gnome; then
+		gnome2_gconf_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use gnome; then
+		fdo-mime_mime_database_update
+		fdo-mime_desktop_database_update
+		gnome2_gconf_install
+	fi
+}
+
+pkg_postrm() {
+	if use gnome; then
+		fdo-mime_desktop_database_update
+		fdo-mime_mime_database_update
+	fi
+}
diff --git a/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild b/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild
index d88ff6d3f43b..e1e93b5de34d 100644
--- a/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild
+++ b/media-libs/ffmpegsource/ffmpegsource-2.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/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild,v 1.2 2015/02/27 22:24:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ffmpegsource/ffmpegsource-2.20.ebuild,v 1.3 2015/06/28 10:25:09 zlogene Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/FFMS/ffms2/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="libav static-libs"
 
 RDEPEND="
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 7601e3d4a732..3002b7180d7a 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,2 +1,3 @@
 DIST gexiv2-0.10.2.tar.xz 242704 SHA256 2fd21f0ed5125e51d02226e7f41be751cfa8ae411a8ed1a651e16b06d79047b2 SHA512 4f2f666b0dc1beb730dbd791dc690bebd8acefbc32a5e2d22fc72a4e2d839d3965b5367134c79c6076507713369193d5fb3e6d0fad984d53e53d57a20e41deab WHIRLPOOL d29a2e13ab12ce7f78ec664ce08f10efb70ce38bae6c8eb4061b16925c6eb498265ceb936eeef35788ea7ac5dc8fd98ddd873dcbd686ceb38f6bd1ebd571810f
+DIST gexiv2-0.10.3.tar.xz 244816 SHA256 390cfb966197fa9f3f32200bc578d7c7f3560358c235e6419657206a362d3988 SHA512 a258a95e3e9dddc6636430d8a2bc222b6605e5d0d122ea1b951f97568cecd04b2d3cbc522625918faf3b5a3e670b01db81a45c2c5c5d65e6eb4b4f4a2ac69e8f WHIRLPOOL e50401f642a2252cad664716004038fdd364e9a42b93c7b9748e0f93b652cad31432f7f58571dd0ff67c8dcb1deca590eaaf42ad287d8d27110d0626a352154b
 DIST libgexiv2_0.6.1.tar.xz 27300 SHA256 72ee2fcc6a98c9e83467adea45b10d1b61c55654c204dcce9c2463615389a9e3 SHA512 76aecd20ffac202badb51eab4e40fee563c3073892beec716bcf24e285df42f2498594a9e0bf487e198e8c955047d55e5b49b506bbf8b67c64956c0b99a84b1b WHIRLPOOL f0d9b514c96ecd8924395a614f4e69d046eff7f99dcad332c843d934923d5a2ad115975c083cfa9fb5b6fe620e5a8fe662738691a54d5c42219279591d79846d
diff --git a/media-libs/gexiv2/gexiv2-0.10.3.ebuild b/media-libs/gexiv2/gexiv2-0.10.3.ebuild
new file mode 100644
index 000000000000..5fb02a64619e
--- /dev/null
+++ b/media-libs/gexiv2/gexiv2-0.10.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gexiv2/gexiv2-0.10.3.ebuild,v 1.1 2015/06/28 09:19:54 maekke Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit eutils multilib python-r1 toolchain-funcs versionator
+
+MY_PV=$(get_version_component_range 1-2)
+
+DESCRIPTION="GObject-based wrapper around the Exiv2 library"
+HOMEPAGE="https://wiki.gnome.org/Projects/gexiv2"
+SRC_URI="mirror://gnome/sources/${PN}/${MY_PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="introspection python static-libs"
+
+REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.26.1:2
+	>=media-gfx/exiv2-0.21:0=
+	introspection? ( dev-libs/gobject-introspection )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	tc-export CXX
+}
+
+src_configure() {
+	econf \
+		$(use_enable introspection) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIB="$(get_libdir)" install
+	dodoc AUTHORS NEWS README THANKS
+
+	if use python ; then
+		python_moduleinto gi/overrides/
+		python_foreach_impl python_domodule GExiv2.py
+	fi
+
+	use static-libs || prune_libtool_files --modules
+}
diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest
index 12cf08343dcf..0ad2b1a5e846 100644
--- a/media-libs/lensfun/Manifest
+++ b/media-libs/lensfun/Manifest
@@ -1,2 +1,3 @@
 DIST lensfun-0.2.8.tar.bz2 628913 SHA256 f88f97fbc78259a2b2edddef295caf50770901107c8469e54bb5e9699faa1a48 SHA512 46fc545882884f806e3e4c8c49237243123f1f463379a4161821f627eb63b61815fcfe9c19f239b733a311c2c952e4a652fabe2d8e351e31d8157a5f2600e284 WHIRLPOOL 84118fe34e9a6984a5567546daf95ab7e5945e93efcfb45bcd86a157b6b20f3764921c53cfecd9419c9cb0205df8e940f61a828ae575f76bf12282b9b4fad0cc
 DIST lensfun-0.3.0.tar.bz2 636694 SHA256 c2c3c03873cb549d49d42f118fcb0ffa95d1e45b9ff395e19facb63bf699bec1 SHA512 2b0a57b3ae48401908d51372814424c1076d4219400935990af917f131e34261c44122773114c045a39db9062d6a0146cd44e20e3942d2bf3c281a5cc1494cc7 WHIRLPOOL 898b19dcfc70e8721bba45a8782f9e33a17180ab4ce21eef06b874f1bcf76bc0cae8231fdcff797ceb0bdd086266a42a47ebe6d63d20d0595aee11bbe713484a
+DIST lensfun-0.3.1.tar.gz 761892 SHA256 216c23754212e051c8b834437e46af3812533bd770c09714e8c06c9d91cdb535 SHA512 cd0f142bb7d6aa154f587d89502da35473a7a02660246bd025ccd5d1982f55425359405898e11ce9094351ad44a2d6786b9ff07d227f75699e99e4de8f40938c WHIRLPOOL f71fc6452253dd4bb5f40cab8079bdb7a0d36a0ef1ad969261c997ce2b944f4ffd8116b3f4f522567c630099bb84b5cb8b4a57f5ea7141e2b8a0cdc2ceab5c20
diff --git a/media-libs/lensfun/lensfun-0.3.1.ebuild b/media-libs/lensfun/lensfun-0.3.1.ebuild
new file mode 100644
index 000000000000..0b85a2c7c96e
--- /dev/null
+++ b/media-libs/lensfun/lensfun-0.3.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lensfun/lensfun-0.3.1.ebuild,v 1.1 2015/06/28 08:59:28 maekke Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit multilib python-single-r1 cmake-utils
+
+DESCRIPTION="lensfun: A library for rectifying and simulating photographic lens distortions"
+HOMEPAGE="http://lensfun.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning.
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test"
+
+RDEPEND=">=dev-libs/glib-2.28
+	media-libs/libpng:0=
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		dev-python/docutils
+	)"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DOCS=( README docs/mounts.txt ChangeLog )
+
+src_configure() {
+	local mycmakeargs=(
+		-DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html
+		-DLIBDIR="${EPREFIX}"/usr/$(get_libdir)
+		-DBUILD_AUXFUN=ON
+		$(cmake-utils_use_build doc)
+		$(cmake-utils_use_build cpu_flags_x86_sse FOR_SSE)
+		$(cmake-utils_use_build cpu_flags_x86_sse2 FOR_SSE2)
+		$(cmake-utils_use_build test TESTS)
+		-DBUILD_STATIC=OFF
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/media-libs/libdvbpsi/libdvbpsi-1.2.0.ebuild b/media-libs/libdvbpsi/libdvbpsi-1.2.0.ebuild
index 8196aa545aab..0534590cc8ce 100644
--- a/media-libs/libdvbpsi/libdvbpsi-1.2.0.ebuild
+++ b/media-libs/libdvbpsi/libdvbpsi-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/media-libs/libdvbpsi/libdvbpsi-1.2.0.ebuild,v 1.3 2015/06/07 11:00:00 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvbpsi/libdvbpsi-1.2.0.ebuild,v 1.4 2015/06/27 09:48:15 ago Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="http://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc static-libs"
 
 RDEPEND=""
diff --git a/media-libs/libsixel/Manifest b/media-libs/libsixel/Manifest
index da8d3f561c14..d901162469c3 100644
--- a/media-libs/libsixel/Manifest
+++ b/media-libs/libsixel/Manifest
@@ -1,2 +1,2 @@
 DIST libsixel-1.4.11.tar.gz 4057623 SHA256 00e19614aaba41b2cc1072b79f8ea89ab523122aa33b1445df478c5507633174 SHA512 1e8d481e425713adca247b3490de35bb343546693a9266fbb5b22a48f182c7dc20ad3e97ac2a4469b308ee4a2557a1937edf93f461880ef058c8201a30c3efdc WHIRLPOOL bbda5864902718b06dccd300b0a7fe717ce8cd3257b66ed92cd285774cd7f7f721502a61fc4b26271ec96d3b9c7adb81de53596fcf29735c7c6d3507197eb446
-DIST libsixel-1.4.7.tar.gz 4057331 SHA256 d3ec8fb8ca77018f53a5388d04e7e135f6e81bfb8595ff5fc1793b738c8aded3 SHA512 5652ac6f4b8c6900fac5dec1413a091741d2905dfe7875f705cf0e436b33e0b24cbf6caeb488babd9bea4c5b3672091f1bca1b74abc95b6c6f9252b58eeae9d1 WHIRLPOOL 6d0c18525082fc0d9d20f7dd4ed5fc9d41cfae76b9b87b94abedc4adb912c6ab5d5b8eea07f3e103f2c13bfefd0fe277010f30019ed16a322107d228f4bab66c
+DIST libsixel-1.4.12.tar.gz 4060158 SHA256 79ba3ed747aa5c02b28d16540bd399e9dfa897b824731584b664c6f9f3ef7148 SHA512 e210bff8a1944bdb0baa33e5cce402965bc82d776ed4e1a92ecc78063e9174ffa418ac7852560ccdddfdbca1fe215f34257efb42f36b5954ffa1d5f87c6d85fc WHIRLPOOL 396472c753b6fccdd69f62e95d5ba0d6d5c4eaf5f1e946f9142649ea8f222a71611250e4ce36cd5745f3a7ceddfaae2750cf0cb507e4ce5bc5225c4baeaea764
diff --git a/media-libs/libsixel/libsixel-1.4.7.ebuild b/media-libs/libsixel/libsixel-1.4.12.ebuild
similarity index 92%
rename from media-libs/libsixel/libsixel-1.4.7.ebuild
rename to media-libs/libsixel/libsixel-1.4.12.ebuild
index c344538d673d..835841d846c5 100644
--- a/media-libs/libsixel/libsixel-1.4.7.ebuild
+++ b/media-libs/libsixel/libsixel-1.4.12.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/libsixel/libsixel-1.4.7.ebuild,v 1.1 2015/02/17 12:33:58 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsixel/libsixel-1.4.12.ebuild,v 1.1 2015/06/27 12:15:14 hattya Exp $
 
 EAPI="5"
 
@@ -19,7 +19,7 @@ RDEPEND="curl? ( net-misc/curl )
 	gd? ( media-libs/gd )
 	gtk? ( x11-libs/gdk-pixbuf:2 )
 	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng )
+	png? ( media-libs/libpng:0 )
 	zsh-completion? ( app-shells/zsh )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/media-libs/libv4l/libv4l-1.6.2.ebuild b/media-libs/libv4l/libv4l-1.6.2.ebuild
index 8c395f659074..98f8d1f264c4 100644
--- a/media-libs/libv4l/libv4l-1.6.2.ebuild
+++ b/media-libs/libv4l/libv4l-1.6.2.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/media-libs/libv4l/libv4l-1.6.2.ebuild,v 1.1 2014/11/25 17:48:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libv4l/libv4l-1.6.2.ebuild,v 1.4 2015/06/28 09:15:26 zlogene Exp $
 
 EAPI=5
 inherit eutils linux-info multilib-minimal
@@ -13,7 +13,7 @@ SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="jpeg"
 
 # The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg.
diff --git a/media-libs/lv2/lv2-1.10.0-r1.ebuild b/media-libs/lv2/lv2-1.10.0-r1.ebuild
index ac36748579e2..55769cae8b0f 100644
--- a/media-libs/lv2/lv2-1.10.0-r1.ebuild
+++ b/media-libs/lv2/lv2-1.10.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/media-libs/lv2/lv2-1.10.0-r1.ebuild,v 1.1 2015/03/21 09:27:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/lv2/lv2-1.10.0-r1.ebuild,v 1.3 2015/06/28 09:54:43 zlogene Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="http://lv2plug.in/spec/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc plugins"
 
 DEPEND="plugins? ( x11-libs/gtk+:2 media-libs/libsndfile )"
diff --git a/media-plugins/gimp-gmic/Manifest b/media-plugins/gimp-gmic/Manifest
index 145858625234..86fa815b986f 100644
--- a/media-plugins/gimp-gmic/Manifest
+++ b/media-plugins/gimp-gmic/Manifest
@@ -1,3 +1,4 @@
 DIST gmic_1.6.0.2.tar.gz 3013936 SHA256 ec9fa41bb8c27f883b9f845258d41f8024936c80bdec723a1c67cfe05ef9b900 SHA512 9d754cc2c72835bd139a39f72863f5315bebc25716efadb023f54661a4bb3fbf29066ddcd258ab8f084164edc9bd02f77a5a801b5c0753322f959205ce0adaf1 WHIRLPOOL 1d8e7126901b7a269f0aae9bdc1bd05a859efa3269de892e712892aa0c06eeb856c27cf05564bac30abcacf27f3e11d2bcc8f179fc29a675960d6640567cdc0c
 DIST gmic_1.6.0.3.tar.gz 3019692 SHA256 91ce6cfe58e29a6819bf849346bf049d2d73f826bbd7b8b8de42dae7d54c7752 SHA512 377b361fc178ab73a7542a39243d32de970ad6ec5928c295d86acf1bd67efc2ebaf72ce818b55c6a7aeda17eb657fbf4176f4f4c90bc48179419842343e3619b WHIRLPOOL fb78366cd72467b2c1ac2e3f704061be173ba28cb888dabee56f7c4c7c2a4b870293c2e1ae88c87edad8f4e511944bb99218e9fae2d30226c1a4b07b001927f6
 DIST gmic_1.6.0.4.tar.gz 3073596 SHA256 ef83e4efc31280e819d02315b1ebbaec6c0b8ebb960da3e785651572853b8f58 SHA512 75c0adc8a0460c140ec656403053e4533fc6434a0b23c2ac842045aeb788a8ce5da5338832574e76e06fd710bebf5ec627a5bc894f00081ffd1b37a5c6aa852e WHIRLPOOL 1eb3afc6c9fb9c07999e5e497e6d6c5075fda46293417e889511c28c9e0ce26b0070e1356dcf0db9bb49e76b83d75941ed917c01b61c98ab537430ea938c831d
+DIST gmic_1.6.5.0.tar.gz 3005945 SHA256 ebc98c4f5848b8343d581104e072299529ac3edbcea7b565ffd6e1fb4bfd66ed SHA512 3feb5589dcc341106ce1305ce2d3f90776f074607bec3b8413519aa5f2c9dc9554a9ee7a5ba1d52d1a9e7676e6bff135d444276c989511f973cd456136d0e4e1 WHIRLPOOL 02f3f711fa9c876fba39e56a42c30f62a6c2d0848ae836f9635d7df0ef57f48f2a8f09ca361232c2239e473046fe7d085260ac365d2e7b6d49e65c3c0aa2e9bc
diff --git a/media-plugins/gimp-gmic/files/gmic-1.6.5.0-makefile.patch b/media-plugins/gimp-gmic/files/gmic-1.6.5.0-makefile.patch
new file mode 100644
index 000000000000..91e7528ae850
--- /dev/null
+++ b/media-plugins/gimp-gmic/files/gmic-1.6.5.0-makefile.patch
@@ -0,0 +1,154 @@
+--- gmic-1.6.5.0/src/Makefile
++++ gmic-1.6.5.0/src/Makefile
+@@ -85,7 +85,6 @@
+ ifndef NO_STDLIB
+ MANDATORY_CFLAGS += -std=c++11
+ endif
+-MANDATORY_LIBS += -L$(USR)/$(LIB)
+ ifeq ($(notdir $(CC)),g++)
+ MANDATORY_CFLAGS += -Wall -W
+ MANDATORY_LIBS += -lm
+@@ -139,14 +138,14 @@
+ # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
+ # This requires the presence of the X11 include and library files.
+ # (package 'libx11-dev' on Debian).
+-X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
+-X11_LIBS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr
++X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr
++X11_LIBS = -lX11 -lpthread #-lXrandr
+ 
+ # Flags to enable fast display, using XShm.
+ # This requires the presence of the X11 extension include and library files.
+ # (package 'libx11-dev' on Debian).
+ XSHM_CFLAGS = -Dcimg_use_xshm
+-XSHM_LIBS = -L$(USR)/X11R6/lib -lXext
++XSHM_LIBS = -lXext
+ 
+ # Flags to enable image display, using GDI32.
+ # This requires the presence of the GDI32 include and library files.
+@@ -174,8 +173,8 @@
+ # Flags to enable native support for MINC2 image files, using the MINC2 library.
+ # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )
+ # (package 'libminc-dev' on Debian).
+-MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include
+-MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
++MINC2_CFLAGS = -Dcimg_use_minc2
++MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz
+ 
+ # Flags to enable native support for downloading files from the network.
+ # ( http://curl.haxx.se/libcurl/ )
+@@ -325,7 +324,6 @@
+ 
+ cli:
+ 	$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
+-	strip gmic$(EXE)
+ 
+ gimp:
+ 	$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS)" gmic_gimp
+@@ -335,11 +333,9 @@
+ 
+ gmicol:
+ 	$(MAKE) "CFLAGS+=$(STD_GMICOL_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GMICOL_LIBS)" gmic
+-	strip gmic$(EXE)
+ 
+ static:
+ 	$(MAKE) "CFLAGS+=$(STATIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STATIC_CLI_LIBS)" gmic
+-	strip gmic$(EXE)
+ 
+ debug:
+ 	$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
+@@ -355,24 +351,22 @@
+ libgmic.o: gmic.cpp gmic.h gmic_def.h CImg.h
+ 	$(CC) -o libgmic.o -c gmic.cpp -fPIC $(CFLAGS)
+ 
+-libgmic: libgmic.o gmic_use_lib.cpp
+-	ar rcs libgmic.a libgmic.o
++libgmic: libgmic.o
++	$(AR) rcs libgmic.a libgmic.o
+ ifeq ($(OS),Darwin)
+-	$(CC) -shared -o libgmic.so libgmic.o $(LIBS)
++	$(CC) $(LDFLAGS) -shared -o libgmic.so libgmic.o $(LIBS)
+ else
+-	$(CC) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so libgmic.o $(LIBS)
+-	$(CC) -o gmic_use_lib gmic_use_lib.cpp -L. -lgmic
++	$(CC) $(LDFLAGS) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so libgmic.o $(LIBS)
+ endif
+ 
+ gmic_gimp.o: gmic.cpp gmic.h gmic_def.h CImg.h
+ 	$(CC) -o gmic_gimp.o -c gmic.cpp -Dgmic_gimp $(CFLAGS)
+ 
+ gmic_gimp : gmic_gimp.o gmic_gimp.cpp
+-	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS)
+-	strip gmic_gimp$(EXE)
++	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) $(LDFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS)
+ 
+ gmic: gmic.cpp gmic.h gmic_def.h CImg.h
+-	$(CC) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LIBS)
++	$(CC) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LDFLAGS) $(LIBS)
+ 
+ gmic_def.h:
+ 	@wget --quiet -O gmic_def.h http://gmic.eu/gmic_def.h
+@@ -397,38 +391,43 @@
+ # Generate bash completion script (requires 'gmic' to be installed first).
+ bashcompletion:
+ 	@mkdir -p ../resources
+-	@\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh
++	@./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh
+ 
+ # Generate man page (requires 'gmic' to be installed first).
+ man:
+ 	@mkdir -p ../man
+-	@\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1
+-	@gzip -f ../man/gmic.1
++	@./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1
+ 
+ # Install/uninstall/clean procedures.
+-install:
++install-gimp:
+ 	mkdir -p $(DESTDIR)$(PLUGINDIR)/
+ 	cp -f gmic_gimp $(DESTDIR)$(PLUGINDIR)/
++
++install-bin:
+ 	mkdir -p $(DESTDIR)$(USR)/$(BIN)/
+ 	cp -f gmic $(DESTDIR)$(USR)/$(BIN)/
++
++install-lib:
+ 	mkdir -p $(DESTDIR)$(USR)/$(INCLUDE)/
+ 	cp -f gmic.h $(DESTDIR)$(USR)/$(INCLUDE)/
+-
+ ifneq ($(OS),Darwin)
+ 	mkdir -p $(DESTDIR)$(USR)/share
+ 	mkdir -p $(DESTDIR)$(USR)/$(LIB)
+ 	cp -f libgmic.so $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.6.5
+ 	ln -fs libgmic.so.1.6.5 $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
+ 	ln -fs libgmic.so.1 $(DESTDIR)$(USR)/$(LIB)/libgmic.so
+-	cp -f ../zart/zart $(DESTDIR)$(USR)/$(BIN)/
+ endif
++
++install-zart:
++	cp -f ../zart/zart $(DESTDIR)$(USR)/$(BIN)/
++
++install-man:
+ 	mkdir -p $(DESTDIR)$(USR)/share/man/
+ 	mkdir -p $(DESTDIR)$(USR)/share/man/man1/
+-	mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
+-	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
+-	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
++	cp -f ../man/gmic.1 $(DESTDIR)$(USR)/share/man/man1/gmic.1
++
++install-bash:
+ 	if [ -d /etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi
+-	if [ -d /opt/local/etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)$(USR)/$(BIN)/gmic
+@@ -438,8 +437,7 @@
+ 	rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
+ 	rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so
+ 	rm -rf $(DESTDIR)$(USR)/share/doc/gmic/
+-	rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
+-	rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
++	rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1
+ 
+ distclean: clean
+ 
diff --git a/media-plugins/gimp-gmic/gimp-gmic-1.6.5.0.ebuild b/media-plugins/gimp-gmic/gimp-gmic-1.6.5.0.ebuild
new file mode 100644
index 000000000000..650b25737a78
--- /dev/null
+++ b/media-plugins/gimp-gmic/gimp-gmic-1.6.5.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gimp-gmic/gimp-gmic-1.6.5.0.ebuild,v 1.1 2015/06/27 03:21:34 radhermit Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="G'MIC GIMP plugin"
+HOMEPAGE="http://gmic.eu/"
+SRC_URI="http://gmic.eu/files/source/gmic_${PV}.tar.gz"
+
+LICENSE="CeCILL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="openmp"
+
+RDEPEND="
+	>=media-gfx/gimp-2.4.0
+	media-libs/libpng:0=
+	sci-libs/fftw:3.0[threads]
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/gmic-${PV}/src
+
+pkg_pretend() {
+	if use openmp ; then
+		tc-has-openmp || die "Please switch to an openmp compatible compiler"
+	fi
+
+	if ! test-flag-CXX -std=c++11 ; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/gmic-${PV}-makefile.patch
+
+	if ! use openmp ; then
+		sed -i -r "s/^(OPENMP_(CFLAGS|LIBS) =).*/\1/" Makefile || die
+	fi
+}
+
+src_compile() {
+	emake CC="$(tc-getCXX)" CFLAGS="${CXXFLAGS}" OPT_CFLAGS= DEBUG_CFLAGS= gimp
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-gimp
+	dodoc ../README
+}
+
+pkg_postinst() {
+	elog "The G'MIC plugin is accessible from the menu:"
+	elog "Filters -> G'MIC"
+}
diff --git a/media-plugins/live/live-2013.02.11.ebuild b/media-plugins/live/live-2013.02.11.ebuild
index f638ad89ef24..8015bb16cea6 100644
--- a/media-plugins/live/live-2013.02.11.ebuild
+++ b/media-plugins/live/live-2013.02.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/media-plugins/live/live-2013.02.11.ebuild,v 1.4 2015/06/11 19:16:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/live-2013.02.11.ebuild,v 1.5 2015/06/27 09:49:01 ago Exp $
 
 EAPI=3
 inherit flag-o-matic eutils toolchain-funcs multilib
@@ -12,7 +12,7 @@ SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="examples static-libs"
 
 S="${WORKDIR}"
diff --git a/media-plugins/mythplugins/Manifest b/media-plugins/mythplugins/Manifest
index 87aea636c501..aceaeccf1b09 100644
--- a/media-plugins/mythplugins/Manifest
+++ b/media-plugins/mythplugins/Manifest
@@ -7,7 +7,9 @@ DIST mythplugins-0.27.3-2d4a7c9235287b0589035974bff282e3f2e9a7e5.tar.xz 1300 SHA
 DIST mythplugins-0.27.3-e1d575da2fdde7ae7119972c688b0ddd15e676c4.tar.xz 1300 SHA256 474717393208877b7813f6d560255d55b30386fc1756888f190396155c89b20b SHA512 c40a066a65ac06fb0dd9f9270917165817adc2a2d37a2ccd15dce2a3624826fa16cfff5df696256b299cb61c83a0527f8f5b304b53a3280f665783747f34e942 WHIRLPOOL 7f02084b34e24ee845c5a236ab94a1853ad40bae3c26f8ccf65d9c0c44129a63946e3b1b4bc037a7ae37dafd1c0a4777642189a54592a5bb262c66cdf8c20c81
 DIST mythplugins-0.27.4-3b4390396bf09dfe3741508ecf7fc71a004abd01.tar.xz 200 SHA256 1c46beb6bcdcfc43caf8a076110b6ad4ada6ef7edb00d4f9503a24a474a51c9c SHA512 bde3d68b40998038099c6c1042a2d40c310f783860f008ae30cdb2088226244ae8a37d329f38ae68c192e93d9c5a80b7e5eb2107d8938095b7724a9327da8220 WHIRLPOOL 86e60d132be0a79a4a728c49730b747b995aeb9f887d88e462a4d06c0e5128e7635800b33952cf6648c5311d2e2a9f8931914825be9c782fd5ae58657e36f3d3
 DIST mythplugins-0.27.4-b305eb5b7fc662146e74983fa3754d622695cdeb.tar.xz 236 SHA256 d45ab17764af11f66874ed9146cc99120aaf51992752d84c925d3a96a9ab2959 SHA512 790d64ce805e1692598d2741b77da9e8ab32d2ceb54f83b334aa36c2003169d3872ab786571a4495b2ae1a734b4749790f0d3aebde0c5ff6fd7ee74b7822718a WHIRLPOOL 19538254498d39d83230813445f2c81ecc363b672a33bc8306a7091ee311386245cf715367999eae6b046dbcdc3295ea9636ec8baad48e46d990a2f9b9b47cb5
+DIST mythplugins-0.27.5-9498257571e8158926b60a0eefc74568c4436823.tar.xz 1364 SHA256 8b7abe67562767478f583fe36704570612425f82a05b9288cc82e3015bf2fc16 SHA512 2fe3a317ecdffc06d9e9b554cf8bfb54a324b7f1441038d51e9f77d13b53693ed6d2721282b239967c6d539947e1b119f579e49b42ba62f7dafd0144c0d28622 WHIRLPOOL 5fc5222364fbb11312f92f8adaef3adff46e89251afcdeea48d1466625072d068ebdb66f9426140765da6f4fc02a117b086033a319f148700cc164bad6fbc0f1
 DIST mythtv-0.27.1.tar.gz 85612356 SHA256 a7039ba46347f1d6a0ed392a53117639c8cba6bc458a6ad30082046d8ad85de7 SHA512 f2c79765948c0a00c7a92f24d2315b5af3044333f67ed8925a59c5bebbdebf98792ef05e2bc8864bfbe77be8cc8ff530e3f4e8761320cfe5ed21369341d8915e WHIRLPOOL 938e0e77070473a523323fe64e40eb416809b40b16943d66a5914d65caa7530dd4b5ba5209919050a7b4968c9e5ca5155ee970f165b39a5c77392debb20bf0ad
 DIST mythtv-0.27.3.tar.gz 85624583 SHA256 8eaaf8c6e42ca6eb81f180467de90d597dbeabb1bb14b7085da353d2980db8f4 SHA512 c825c6d5a4fab6fe3179dbb78730575732615ab41cf2d21f82c6e6317ab62c9a6570cd9d204c39c04d176138c90dfdc95892cd8336bb8487051f1f3842cc0866 WHIRLPOOL b9382dbe1019bde96135ff404039d4db5ef03d52d5f2d75cfd3005e1e5eea702529df3a45497c081de89d9ecfd5a6a143b6dadc228e581453b9aa75c63bcc042
 DIST mythtv-0.27.4.tar.gz 85644227 SHA256 1f734ffc776e4938aa913e49ce94279f2c2d520c62af278f1d04fe399723365b SHA512 6f858f32467756e96db6f79ccb2c42edc0bf22d217cb7b9dc9188ada994bbb9aafe9f72dd71aca10cd26bad1bd5d344af64487ec5fc925872aba81cf7aa257c8 WHIRLPOOL 65cd1869b7cee00197179b13a138d466dc443ecaf23c665754e0451e7ab51940e7235cb74d23ed7296be2c716f443c9c42df2fdd918a0480a04c63381ebce2c4
+DIST mythtv-0.27.5.tar.gz 85652939 SHA256 7e625f94332effeadfba8e7ae7c98d44a83bfc25b7c59e39adce67dc2f4e1e1b SHA512 b912e010e54271f9321ac1b11d4a31e4093f86c0f2ae3139d4b55085bab142ca3fc6d847d163f6b75aa31320404914c71c094528dc8ee7d70086e56a828b9169 WHIRLPOOL e9ebbbabac6ed53b4ec90537371a63e053bb9a2c0a0e920e43d3d2e475f87bdd0ac5a4604045498e88aaf06b11eb054d50dea7881c87dbd45a36c08309e1b880
 DIST mythtv-0.27.tar.gz 85904162 SHA256 494ebd7ee384e751c05ee0a1b3dcd3618caf72f1e94810381c09c2b5d1c799f0 SHA512 2ea070497a7610b8e1548112d9925a28aeedba819c2d063e88cc63daf69947379ce7213e357c26bf2221f8a8e865c937dee3b9bf2695644f2f1adeadf6d11116 WHIRLPOOL 74c4fade0d0f93a64e5f1da3120358f15f6f8891f53b7c74b41a286369e192790cae87829b79a3a90ce3ca23ede63b3dfa809b514b68cee220432794414b8a47
diff --git a/media-plugins/mythplugins/mythplugins-0.27.5_p20150627.ebuild b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627.ebuild
new file mode 100644
index 000000000000..83ea51fc5154
--- /dev/null
+++ b/media-plugins/mythplugins/mythplugins-0.27.5_p20150627.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/mythplugins/mythplugins-0.27.5_p20150627.ebuild,v 1.1 2015/06/27 18:01:13 rich0 Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="2:2.7"
+BACKPORTS="9498257571e8158926b60a0eefc74568c4436823"
+MY_P=${P%_p*}
+
+inherit eutils python
+
+DESCRIPTION="Official MythTV plugins"
+HOMEPAGE="http://www.mythtv.org"
+SRC_URI="https://github.com/MythTV/mythtv/archive/v0.27.5.tar.gz -> mythtv-0.27.5.tar.gz
+	${BACKPORTS:+http://dev.gentoo.org/~rich0/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MYTHPLUGINS="mytharchive mythbrowser mythgallery mythgame \
+mythmusic mythnetvision mythnews mythweather mythzoneminder"
+
+IUSE="${MYTHPLUGINS} alsa cdda cdr exif fftw hls ieee1394 libass raw theora vorbis xml xvid"
+
+DEPEND="!media-plugins/mytharchive
+	!media-plugins/mythbrowser
+	!media-plugins/mythgallery
+	!media-plugins/mythgame
+	!media-plugins/mythmovies
+	!media-plugins/mythmusic
+	!media-plugins/mythnetvision
+	!media-plugins/mythnews
+	!media-plugins/mythweather
+	=media-tv/mythtv-${PV}*:=[alsa=,hls=,ieee1394=,libass=,python,theora=,vorbis=,xml=,xvid=]
+	dev-libs/glib:=
+	xml? ( >=dev-libs/libxml2-2.6.0:= )
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	dev-qt/qtsql:4
+	dev-libs/openssl:=
+	alsa? ( >=media-libs/alsa-lib-1.0.24:= )
+	hls? (
+		media-libs/faac:=
+		media-libs/libvpx:=
+		>=media-libs/x264-0.0.20111220:=
+		>=media-sound/lame-3.93.1
+	)
+	media-libs/freetype:=
+	libass? ( >=media-libs/libass-0.9.11:= )
+	media-libs/libpng:=
+	theora? ( media-libs/libtheora:= media-libs/libogg:= )
+	vorbis? ( media-libs/libogg:= )
+	xvid? ( >=media-libs/xvid-1.1.0:= )
+	virtual/libudev:=
+	ieee1394? (
+		>=sys-libs/libraw1394-1.2.0:=
+		>=sys-libs/libavc1394-0.5.3:=
+		>=media-libs/libiec61883-1.0.0:=
+	)
+	x11-libs/libX11:=
+	sys-libs/zlib:=
+	x11-libs/libXext:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXv:=
+	x11-libs/libXxf86vm:=
+	fftw? ( sci-libs/fftw:= )
+	sys-apps/util-linux:=
+	mythzoneminder? ( virtual/mysql )
+	mytharchive? (
+		app-cdr/dvd+rw-tools
+		virtual/python-imaging:=
+		media-video/dvdauthor
+		media-video/mjpegtools[png]
+		media-video/transcode
+		virtual/cdrtools
+	)
+	mythgallery? (
+		media-libs/tiff:=
+		virtual/opengl
+		exif? ( >media-libs/libexif-0.6.9:= )
+		raw? ( media-gfx/dcraw )
+	)
+	mythmusic? (
+		>=media-libs/flac-1.1.2:=
+		>=media-libs/taglib-1.6:=
+		vorbis? ( >=media-libs/libvorbis-1.0:= )
+		virtual/opengl
+		cdda? (
+			dev-libs/libcdio:=
+			cdr? ( virtual/cdrtools )
+		)
+
+	)
+	mythnetvision? (
+		=dev-lang/python-2*:=[xml]
+		dev-python/lxml:=
+		dev-python/mysql-python:=
+		dev-python/oauth:=
+		dev-python/pycurl:=
+	)
+	mythweather? (
+		dev-perl/DateManip
+		dev-perl/DateTime-Format-ISO8601
+		>=dev-perl/DateTime-1
+		dev-perl/ImageSize
+		dev-perl/JSON
+		dev-perl/SOAP-Lite
+		dev-perl/XML-Simple
+		dev-perl/XML-Parser
+		dev-perl/XML-SAX
+		dev-perl/XML-XPath
+	)
+	mythbrowser? (
+		dev-qt/qtwebkit:4
+	)"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="
+	cdda? ( mythmusic )
+	cdr? ( mythmusic cdda )
+	exif? ( mythgallery )
+	fftw? ( mythmusic )
+	mythnews? ( mythbrowser )
+	raw? ( mythgallery )"
+
+S="${WORKDIR}/mythtv-0.27.5/mythplugins"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${WORKDIR}/${MY_P}/patches" \
+			epatch
+
+	epatch_user
+}
+
+src_configure() {
+	./configure \
+		--prefix=/usr \
+		--python=python2 \
+		--enable-opengl \
+		$(use_enable mythzoneminder) \
+		$(use_enable mytharchive) \
+		$(use_enable mythbrowser) \
+		$(use_enable mythgallery) \
+		$(use_enable mythgame) \
+		$(use_enable mythmusic) \
+		$(use_enable mythnetvision) \
+		$(use_enable mythnews) \
+		$(use_enable mythweather) \
+		$(use_enable cdda cdio) \
+		$(use_enable exif) \
+		$(use_enable exif new-exif) \
+		$(use_enable raw dcraw) \
+		|| die "configure failed"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "make install failed"
+}
diff --git a/media-radio/xastir/xastir-2.0.6.ebuild b/media-radio/xastir/xastir-2.0.6.ebuild
index 3e526f512223..d6d54af8b660 100644
--- a/media-radio/xastir/xastir-2.0.6.ebuild
+++ b/media-radio/xastir/xastir-2.0.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/media-radio/xastir/xastir-2.0.6.ebuild,v 1.3 2015/04/26 16:24:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/xastir-2.0.6.ebuild,v 1.4 2015/06/27 17:47:01 ago Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="festival gdal geotiff graphicsmagick"
 
 DEPEND=">=x11-libs/motif-2.3:0
diff --git a/media-sound/gnac/gnac-0.2.4.1.ebuild b/media-sound/gnac/gnac-0.2.4.1.ebuild
index 835e194009ad..1dbaeab0f36e 100644
--- a/media-sound/gnac/gnac-0.2.4.1.ebuild
+++ b/media-sound/gnac/gnac-0.2.4.1.ebuild
@@ -1,8 +1,8 @@
-# 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/media-sound/gnac/gnac-0.2.4.1.ebuild,v 1.1 2012/08/28 00:51:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnac/gnac-0.2.4.1.ebuild,v 1.2 2015/06/27 09:35:22 pacho Exp $
 
-EAPI=4
+EAPI=5
 
 inherit eutils autotools gnome2
 
@@ -16,7 +16,8 @@ KEYWORDS="~amd64 ~x86"
 LANGS=" cs da de en_GB es gl fr he hu it lt nb pt_BR pl ro ru sl sv te tr zh_CN"
 IUSE="aac flac libnotify mp3 nls wavpack ${LANGS// / linguas_}"
 
-RDEPEND="x11-libs/gtk+:3
+RDEPEND="
+	x11-libs/gtk+:3
 	dev-libs/libunique:3
 	dev-libs/libxml2:2
 	libnotify? ( x11-libs/libnotify )
@@ -25,21 +26,23 @@ RDEPEND="x11-libs/gtk+:3
 	media-plugins/gst-plugins-gio:0.10
 	media-plugins/gst-plugins-meta:0.10[flac?,mp3?,wavpack?]
 	aac? ( media-plugins/gst-plugins-faac:0.10 )
-	nls? ( virtual/libintl )"
+	nls? ( virtual/libintl )
+"
 DEPEND="${RDEPEND}
 	>=app-text/gnome-doc-utils-0.17.2
+	gnome-base/gnome-common
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-cflags.patch
 	epatch "${FILESDIR}"/${P}-nls.patch
 
-	gnome2_src_prepare
 	eautoreconf
+	gnome2_src_prepare
 }
 
 src_configure() {
-	G2CONF="${G2CONF} $(use_enable nls)"
-	gnome2_src_configure
+	gnome2_src_configure $(use_enable nls)
 }
diff --git a/media-sound/jack-keyboard/jack-keyboard-2.5.ebuild b/media-sound/jack-keyboard/jack-keyboard-2.5.ebuild
index 65c779e241ca..625742825848 100644
--- a/media-sound/jack-keyboard/jack-keyboard-2.5.ebuild
+++ b/media-sound/jack-keyboard/jack-keyboard-2.5.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/media-sound/jack-keyboard/jack-keyboard-2.5.ebuild,v 1.4 2014/01/30 02:39:28 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-keyboard/jack-keyboard-2.5.ebuild,v 1.5 2015/06/27 09:49:16 ago Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ SRC_URI="http://pin.if.uz.zgora.pl/~trasz/jack-keyboard/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="lash X"
 
 RDEPEND=">=media-sound/jack-audio-connection-kit-0.103
diff --git a/media-sound/pithos/Manifest b/media-sound/pithos/Manifest
index 3d9381f9059a..ccab0104008d 100644
--- a/media-sound/pithos/Manifest
+++ b/media-sound/pithos/Manifest
@@ -1,2 +1,2 @@
-DIST pithos-1.0.0.tar.gz 107108 SHA256 cacd1a09e984fd83c4e9f38fa41feb0990981e0fd14d7b8c64e99cff294a9184 SHA512 175c2c6d06b111063b0d1b655aa8386797a27be8161a446a2056959d5f6281ed92b88a8a7b92b0a35d9eebb23d7dcfbeb02ee62a5f4541df6d602f1f4543b6dd WHIRLPOOL 1ec296cdb10ab86a4ad7893cd15c45081237d9001f9975fbc8ffb7e0ce2502417e3101b4484ce61510417143d202863a25d6a0235ea64e86a68fe1947d0f18ba
 DIST pithos-1.0.1.tar.gz 112230 SHA256 67b83927d5111067aefbf034d23880f96b1a2d300464e8491efa80e97e67f50f SHA512 ab1b671ae4c75534782e64f61eb4bdb63781ac895e1e07f4c6bc64aa56033a0fb301e6f673ea2ddea6e51c1aa69f3fc4e81d7ec4db80cfd7843550424a5cff26 WHIRLPOOL eaa1fe7341f639624847bf574a9b4f35d28a41a9825cdb7cd84ca22464043a5da74ff4dbf914b874077612412449b38d66f80b69e82a7befffdf19d54155c3c9
+DIST pithos-1.1.1.tar.gz 112793 SHA256 4424534bbf7ab3d3d6c51764d689606fd0df214422eb79ccc91a8981f95d7dce SHA512 8813e5218b448cac64d9787388f3bfa8e7a06cc785c3f7ca6bdce5dee2fdb393d9019169256a01f43fd610ebfd8e07d6fcdafeb476c18d88d8de87895c5b9c2f WHIRLPOOL 401cbd1e3cbeaa0457e4e75be3f2fe04e0ca252274e1539fe9de0777e2c77c3e50e4b4e401bbca0ff0371c8aedc08920384b87016f8357b2caadd3f86e90247d
diff --git a/media-sound/pithos/pithos-1.0.0.ebuild b/media-sound/pithos/pithos-1.1.1.ebuild
similarity index 63%
rename from media-sound/pithos/pithos-1.0.0.ebuild
rename to media-sound/pithos/pithos-1.1.1.ebuild
index cba0a58ac52d..7b3c9c6f6cfd 100644
--- a/media-sound/pithos/pithos-1.0.0.ebuild
+++ b/media-sound/pithos/pithos-1.1.1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pithos/pithos-1.0.0.ebuild,v 1.2 2015/03/11 18:53:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pithos/pithos-1.1.1.ebuild,v 1.1 2015/06/26 17:28:21 chutzpah Exp $
 
 EAPI=5
-PYTHON_COMPAT=(python3_3)
+PYTHON_COMPAT=(python3_4)
 inherit eutils distutils-r1
 
 if [[ ${PV} =~ [9]{4,} ]]; then
@@ -25,16 +25,15 @@ IUSE="libnotify appindicator +keybinder"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-	dev-python/pylast[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3
+	>=dev-python/pygobject-3.12[${PYTHON_USEDEP}]
+	x11-libs/pango[introspection]
 	media-libs/gstreamer:1.0[introspection]
 	media-plugins/gst-plugins-meta:1.0[aac,http,mp3]
-	libnotify? ( x11-libs/libnotify )
-	appindicator? ( dev-libs/libappindicator:3 )
-	keybinder? ( dev-libs/keybinder:3 )"
-
-PATCHES=("${FILESDIR}/${P}-icons.patch")
+	>=x11-libs/gtk+-3.14:3[introspection]
+	x11-themes/gnome-icon-theme-symbolic
+	libnotify? ( x11-libs/libnotify[introspection] )
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	keybinder? ( dev-libs/keybinder:3[introspection] )"
 
 python_test() {
 	esetup.py test || die
diff --git a/media-sound/pithos/pithos-9999.ebuild b/media-sound/pithos/pithos-9999.ebuild
index 54d149b7391b..36de19ccca47 100644
--- a/media-sound/pithos/pithos-9999.ebuild
+++ b/media-sound/pithos/pithos-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pithos/pithos-9999.ebuild,v 1.5 2015/03/11 18:53:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pithos/pithos-9999.ebuild,v 1.6 2015/06/26 17:28:21 chutzpah Exp $
 
 EAPI=5
-PYTHON_COMPAT=(python3_{3,4})
+PYTHON_COMPAT=(python3_4)
 inherit eutils distutils-r1
 
 if [[ ${PV} =~ [9]{4,} ]]; then
@@ -25,16 +25,15 @@ IUSE="libnotify appindicator +keybinder"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-	dev-python/pylast[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3
+	>=dev-python/pygobject-3.12[${PYTHON_USEDEP}]
+	x11-libs/pango[introspection]
 	media-libs/gstreamer:1.0[introspection]
 	media-plugins/gst-plugins-meta:1.0[aac,http,mp3]
-	libnotify? ( x11-libs/libnotify )
-	appindicator? ( dev-libs/libappindicator:3 )
-	keybinder? ( dev-libs/keybinder:3 )"
-
-PATCHES=("${FILESDIR}/${P}-icons.patch")
+	>=x11-libs/gtk+-3.14:3[introspection]
+	x11-themes/gnome-icon-theme-symbolic
+	libnotify? ( x11-libs/libnotify[introspection] )
+	appindicator? ( dev-libs/libappindicator:3[introspection] )
+	keybinder? ( dev-libs/keybinder:3[introspection] )"
 
 python_test() {
 	esetup.py test || die
diff --git a/media-sound/timidity++/timidity++-2.14.0-r2.ebuild b/media-sound/timidity++/timidity++-2.14.0-r2.ebuild
index 8ad110158e37..927aac7950ab 100644
--- a/media-sound/timidity++/timidity++-2.14.0-r2.ebuild
+++ b/media-sound/timidity++/timidity++-2.14.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/media-sound/timidity++/timidity++-2.14.0-r2.ebuild,v 1.5 2015/06/09 18:28:12 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.14.0-r2.ebuild,v 1.6 2015/06/27 09:48:50 ago Exp $
 
 EAPI=5
 inherit autotools eutils elisp-common user systemd toolchain-funcs
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz"
 
 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="motif oss nas X gtk vorbis tk slang alsa jack emacs ao selinux speex flac ncurses"
 
 DEPEND="ncurses? ( >=sys-libs/ncurses-5 )
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 940757273363..91be4bde6915 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -10,4 +10,6 @@ DIST mythtv-0.27.3.tar.gz 85624583 SHA256 8eaaf8c6e42ca6eb81f180467de90d597dbeab
 DIST mythtv-0.27.4-3b4390396bf09dfe3741508ecf7fc71a004abd01.tar.xz 12752 SHA256 b3331d8dbe36d34c88ab42aec2d2d84e2bb51ba11b714f23c5faa91e32ce06de SHA512 8f80378cfc5be8058baa74f7d25e8ec0a0405201e6f8b77b6cb96ba91dbd9b9251947ba7b6e48efad5270624769195891e2c48e0c8d0a16d6f8893801103a26b WHIRLPOOL 140d8dfb39942ef587b551099942b6b284bd49e070225aaee71f3fb4feebfc0ce293461b87fe9f6477def2745a6d71226fb103cf090a25fc33ecf85bd62212b6
 DIST mythtv-0.27.4-b305eb5b7fc662146e74983fa3754d622695cdeb.tar.xz 2376 SHA256 a08af2e8457099397512eb10c8729c75ceff078045881e22a1c53595536f41ba SHA512 63e52a9dc34e344e632ab339ab3ab4093e3f9e363b406c5b0b172744fbd78187dde20ed3da9bc2d1258404c412e4d39f855f9060457337815c995773aa0a62b9 WHIRLPOOL 59ba3805295b990f785c7e4f6fcc1c1748444a2d515119de8acaaa31979fe4fec05181ad87b24aeb62de54a100cc017bcad46fdd65dcc0f6d06c773bf7d94ed6
 DIST mythtv-0.27.4.tar.gz 85644227 SHA256 1f734ffc776e4938aa913e49ce94279f2c2d520c62af278f1d04fe399723365b SHA512 6f858f32467756e96db6f79ccb2c42edc0bf22d217cb7b9dc9188ada994bbb9aafe9f72dd71aca10cd26bad1bd5d344af64487ec5fc925872aba81cf7aa257c8 WHIRLPOOL 65cd1869b7cee00197179b13a138d466dc443ecaf23c665754e0451e7ab51940e7235cb74d23ed7296be2c716f443c9c42df2fdd918a0480a04c63381ebce2c4
+DIST mythtv-0.27.5-9498257571e8158926b60a0eefc74568c4436823.tar.xz 11992 SHA256 aef3b944a9f4b49daa3f5489b58a080db35eb7b85c76819d9d00ccf1adfadfdf SHA512 bddc80f6d7e7ad583459a2192660e6101d53d8821c0f875634f90588bc6fbff86c80fa75f6e8cb859fd5164a81f0ad3427939d57da2b112741b1ea9ce646659d WHIRLPOOL 249d4f5332d943669610b96363b6d2b19d63973ba191bd62900e7d31362b4c541077ffe6ca9eae6027c6d1d5fea1d691722739ff9d0d7af6566d288921444961
+DIST mythtv-0.27.5.tar.gz 85652939 SHA256 7e625f94332effeadfba8e7ae7c98d44a83bfc25b7c59e39adce67dc2f4e1e1b SHA512 b912e010e54271f9321ac1b11d4a31e4093f86c0f2ae3139d4b55085bab142ca3fc6d847d163f6b75aa31320404914c71c094528dc8ee7d70086e56a828b9169 WHIRLPOOL e9ebbbabac6ed53b4ec90537371a63e053bb9a2c0a0e920e43d3d2e475f87bdd0ac5a4604045498e88aaf06b11eb054d50dea7881c87dbd45a36c08309e1b880
 DIST mythtv-0.27.tar.gz 85904162 SHA256 494ebd7ee384e751c05ee0a1b3dcd3618caf72f1e94810381c09c2b5d1c799f0 SHA512 2ea070497a7610b8e1548112d9925a28aeedba819c2d063e88cc63daf69947379ce7213e357c26bf2221f8a8e865c937dee3b9bf2695644f2f1adeadf6d11116 WHIRLPOOL 74c4fade0d0f93a64e5f1da3120358f15f6f8891f53b7c74b41a286369e192790cae87829b79a3a90ce3ca23ede63b3dfa809b514b68cee220432794414b8a47
diff --git a/media-tv/mythtv/metadata.xml b/media-tv/mythtv/metadata.xml
index fc7ce65acf25..a1e2ee6a6769 100644
--- a/media-tv/mythtv/metadata.xml
+++ b/media-tv/mythtv/metadata.xml
@@ -46,6 +46,7 @@
 		scripts in Perl to control your MythTV setup or communicate with
 		it.</flag>
 		<flag name="raop">Remote Audio Output Protocol (aka AirTunes/AirPlay)</flag>
+		<flag name="wrapper">Use Ubuntu mythtfrontend wrapper.</flag>
 		<flag name="xmltv">Pulls in the <pkg>media-tv/xmltv</pkg> TV listing
 		grabbers for users not using Schedules Direct.</flag>
 	</use>
diff --git a/media-tv/mythtv/mythtv-0.27.5_p20150627.ebuild b/media-tv/mythtv/mythtv-0.27.5_p20150627.ebuild
new file mode 100644
index 000000000000..182549c01299
--- /dev/null
+++ b/media-tv/mythtv/mythtv-0.27.5_p20150627.ebuild
@@ -0,0 +1,359 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.27.5_p20150627.ebuild,v 1.1 2015/06/27 18:01:12 rich0 Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="python? 2:2.7"
+BACKPORTS="9498257571e8158926b60a0eefc74568c4436823"
+MY_P=${P%_p*}
+
+inherit flag-o-matic multilib eutils python user systemd
+
+MYTHTV_VERSION="v0.27.5"
+MYTHTV_BRANCH="fixes/0.27"
+
+DESCRIPTION="Homebrew PVR project"
+HOMEPAGE="http://www.mythtv.org"
+SRC_URI="https://github.com/MythTV/mythtv/archive/v0.27.5.tar.gz -> mythtv-0.27.5.tar.gz
+	${BACKPORTS:+http://dev.gentoo.org/~rich0/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+IUSE_INPUT_DEVICES="input_devices_joystick"
+IUSE="alsa altivec libass autostart bluray cec crystalhd debug dvb dvd \
+egl fftw +hls ieee1394 jack lcd lirc perl pulseaudio python raop +theora \
+vaapi vdpau +vorbis +wrapper +xml xmltv +xvid ${IUSE_INPUT_DEVICES}"
+
+REQUIRED_USE="
+	bluray? ( xml )
+	theora? ( vorbis )"
+
+COMMON="
+	>=media-libs/freetype-2.0:=
+	sys-libs/zlib:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXinerama:=
+	x11-libs/libXv:=
+	x11-libs/libXrandr:=
+	x11-libs/libXxf86vm:=
+	>=dev-qt/qtcore-4.7.2:4=
+	>=dev-qt/qtdbus-4.7.2:4=
+	>=dev-qt/qtgui-4.7.2:4=
+	>=dev-qt/qtscript-4.7.2:4=
+	>=dev-qt/qtsql-4.7.2:4=[mysql]
+	>=dev-qt/qtopengl-4.7.2:4=[egl?]
+	>=dev-qt/qtwebkit-4.7.2:4=
+	x11-misc/wmctrl:=
+	virtual/mysql
+	virtual/opengl:=
+	alsa? ( >=media-libs/alsa-lib-1.0.24:= )
+	bluray? (
+		dev-libs/libcdio:=
+		media-libs/libbluray:=
+	)
+	cec? ( dev-libs/libcec:= )
+	dvb? (
+		media-libs/libdvb:=
+		virtual/linuxtv-dvb-headers:=
+	)
+	dvd? ( dev-libs/libcdio:= )
+	egl? ( media-libs/mesa:=[egl] )
+	fftw? ( sci-libs/fftw:3.0= )
+	hls? (
+		media-libs/faac:=
+		media-libs/libvpx:=
+		>=media-libs/x264-0.0.20111220:=
+		>=media-sound/lame-3.93.1
+	)
+	ieee1394? (
+		>=sys-libs/libraw1394-1.2.0:=
+		>=sys-libs/libavc1394-0.5.3:=
+		>=media-libs/libiec61883-1.0.0:=
+	)
+	jack? ( media-sound/jack-audio-connection-kit )
+	lcd? ( app-misc/lcdproc )
+	libass? ( >=media-libs/libass-0.9.11:= )
+	lirc? ( app-misc/lirc )
+	perl? (
+		dev-perl/DBD-mysql
+		dev-perl/Net-UPnP
+		dev-perl/LWP-Protocol-https
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-INET6
+		>=dev-perl/libwww-perl-5
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	python? (
+		dev-python/mysql-python
+		dev-python/lxml
+		dev-python/urlgrabber
+	)
+	raop? (
+		dev-libs/openssl:=
+		net-dns/avahi[mdnsresponder-compat]
+	)
+	theora? ( media-libs/libtheora:= media-libs/libogg:= )
+	vaapi? ( x11-libs/libva:= )
+	vdpau? ( x11-libs/libvdpau:= )
+	vorbis? ( >=media-libs/libvorbis-1.0:= media-libs/libogg:= )
+	xml? ( >=dev-libs/libxml2-2.6.0:= )
+	xvid? ( >=media-libs/xvid-1.1.0:= )
+	!media-tv/mythtv-bindings
+	!x11-themes/mythtv-themes
+	media-libs/taglib:=
+	dev-libs/glib:=
+	"
+
+RDEPEND="${COMMON}
+	media-fonts/corefonts
+	media-fonts/dejavu
+	media-fonts/liberation-fonts
+	x11-apps/xinit
+	autostart? (
+		net-dialup/mingetty
+		x11-wm/evilwm
+		x11-apps/xset
+	)
+	dvd? ( media-libs/libdvdcss:= )
+	xmltv? ( >=media-tv/xmltv-0.5.43 )
+	"
+
+DEPEND="${COMMON}
+	dev-lang/yasm
+	x11-proto/xineramaproto
+	x11-proto/xf86vidmodeproto
+	"
+
+S="${WORKDIR}/${MY_P}/mythtv"
+
+MYTHTV_GROUPS="video,audio,tty,uucp"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
+	usermod -a -G ${MYTHTV_GROUPS} mythtv
+}
+
+src_prepare() {
+	[[ -n ${BACKPORTS} ]] && \
+		EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/../patches" \
+			epatch
+
+	# Perl bits need to go into vender_perl and not site_perl
+	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
+		-i "${S}"/bindings/perl/Makefile
+
+	# Fix up the version info since we are using the fixes/${PV} branch
+	echo "SOURCE_VERSION=\"${MYTHTV_VERSION}\"" > "${S}"/VERSION
+	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/VERSION
+	echo "SOURCE_VERSION=\"${BACKPORTS}\"" > "${S}"/EXPORTED_VERSION
+	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/EXPORTED_VERSION
+
+	echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
+
+	epatch "${FILESDIR}/libdir-27.patch"
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf=
+
+	# Setup paths
+	myconf="${myconf} --prefix=${EPREFIX}/usr"
+	myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
+	myconf="${myconf} --libdir-name=$(get_libdir)"
+	myconf="${myconf} --mandir=${EPREFIX}/usr/share/man"
+
+	# Audio
+	myconf="${myconf} $(use_enable alsa audio-alsa)"
+	myconf="${myconf} $(use_enable jack audio-jack)"
+	use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
+
+	use altivec    || myconf="${myconf} --disable-altivec"
+	myconf="${myconf} $(use_enable dvb)"
+	myconf="${myconf} $(use_enable ieee1394 firewire)"
+	myconf="${myconf} $(use_enable lirc)"
+	myconf="${myconf} $(use_enable xvid libxvid)"
+	myconf="${myconf} --dvb-path=/usr/include"
+	myconf="${myconf} --enable-xrandr"
+	myconf="${myconf} --enable-xv"
+	myconf="${myconf} --enable-x11"
+	myconf="${myconf} --enable-nonfree"
+	use cec || myconf="${myconf} --disable-libcec"
+	use raop || myconf="${myconf} --disable-libdns-sd"
+	myconf="${myconf} $(use_enable theora libtheora)"
+	myconf="${myconf} $(use_enable vorbis libvorbis)"
+
+	if use hls; then
+		myconf="${myconf} --enable-libmp3lame"
+		myconf="${myconf} --enable-libx264"
+		myconf="${myconf} --enable-libvpx"
+		myconf="${myconf} --enable-libfaac"
+	fi
+
+	myconf="${myconf} $(use_enable libass)"
+
+	if use perl && use python; then
+		myconf="${myconf} --with-bindings=perl,python"
+	elif use perl; then
+		myconf="${myconf} --without-bindings=python"
+		myconf="${myconf} --with-bindings=perl"
+	elif use python; then
+		myconf="${myconf} --without-bindings=perl"
+		myconf="${myconf} --with-bindings=python"
+	else
+		myconf="${myconf} --without-bindings=perl,python"
+	fi
+
+	use python && myconf="${myconf} --python=$(PYTHON)"
+
+	if use debug; then
+		myconf="${myconf} --compile-type=debug"
+	else
+		myconf="${myconf} --compile-type=release"
+		#myconf="${myconf} --enable-debug" does nothing per sphery
+		#myconf="${myconf} --disable-stripping" does nothing per sphery
+	fi
+
+	# Video
+	use vdpau && myconf="${myconf} --enable-vdpau"
+	myconf="${myconf} $(use_enable vaapi)"
+	use crystalhd && myconf="${myconf} --enable-crystalhd"
+
+	# Input
+	use input_devices_joystick || myconf="${myconf} --disable-joystick-menu"
+
+	# Clean up DSO load times and other compiler bits
+	myconf="${myconf} --enable-symbol-visibility"
+	myconf="${myconf} --enable-pic"
+
+	# CPU settings
+	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+		[ "${i}" = "native" ] && i="host"
+		myconf="${myconf} --cpu=${i}"
+		break
+	done
+
+	if tc-is-cross-compiler ; then
+		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel)"
+		myconf="${myconf} --cross-prefix=${CHOST}-"
+	fi
+
+	# Build boosters
+	has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
+	has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
+
+	chmod +x ./external/FFmpeg/version.sh
+
+	einfo "Running ./configure ${myconf}"
+	./configure \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-cxxflags="${CXXFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		${myconf} || die "configure died"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "install failed"
+	dodoc AUTHORS UPGRADING README
+
+	insinto /usr/share/mythtv/database
+	doins database/*
+
+	newinitd "${FILESDIR}"/mythbackend.init mythbackend
+	newconfd "${FILESDIR}"/mythbackend.conf mythbackend
+	systemd_dounit "${FILESDIR}"/mythbackend.service
+
+	dodoc keys.txt
+
+	keepdir /etc/mythtv
+	chown -R mythtv "${ED}"/etc/mythtv
+	keepdir /var/log/mythtv
+	chown -R mythtv "${ED}"/var/log/mythtv
+	dodir /var/log/mythtv/old
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv
+
+	insinto /usr/share/mythtv/contrib
+	doins -r contrib/*
+
+	# Install our mythfrontend wrapper which is similar to Mythbuntu's
+	if use wrapper; then
+		mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real"
+		newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
+		newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
+	fi
+
+	if use autostart; then
+		dodir /etc/env.d/
+		echo 'CONFIG_PROTECT="/home/mythtv/"' > "${ED}"/etc/env.d/95mythtv
+
+		insinto /home/mythtv
+		newins "${FILESDIR}"/bash_profile .bash_profile
+		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
+	fi
+
+	# Make Python files executable
+	find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
+		if [[ ! "${file##*/}" = "__init__.py" ]]; then
+			chmod a+x "${file}"
+		fi
+	done
+
+	# Ensure that Python scripts are executed by Python 2
+	python_convert_shebangs -q -r 2 "${ED}/usr/share/mythtv"
+
+	# Make shell & perl scripts executable
+	find "${ED}" -type f -name '*.sh' -o -type f -name '*.pl' | \
+		while read file; do
+		chmod a+x "${file}"
+	done
+}
+
+pkg_preinst() {
+	export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/"
+}
+
+pkg_postinst() {
+	use python && python_mod_optimize MythTV
+
+	elog "To have this machine operate as recording host for MythTV, "
+	elog "mythbackend must be running. Run the following:"
+	elog "rc-update add mythbackend default"
+	elog
+	elog "Your recordings folder must be owned 'mythtv'. e.g."
+	elog "chown -R mythtv /var/lib/mythtv"
+
+	elog "Want mythfrontend to start automatically?"
+	elog "Set USE=autostart. Details can be found at:"
+	elog "http://dev.gentoo.org/~cardoe/mythtv/autostart.html"
+	elog
+	elog "Note that the systemd unit now restarts by default and logs"
+	elog "to journald via the console at the notice verbosity."
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup MythTV
+}
+
+pkg_info() {
+	if [[ -f "${EROOT}"/usr/bin/mythfrontend ]]; then
+		"${EROOT}"/usr/bin/mythfrontend --version
+	fi
+}
+
+pkg_config() {
+	echo "Creating mythtv MySQL user and mythconverg database if it does not"
+	echo "already exist. You will be prompted for your MySQL root password."
+	"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
+}
diff --git a/media-tv/v4l-utils/v4l-utils-1.6.2.ebuild b/media-tv/v4l-utils/v4l-utils-1.6.2.ebuild
index 48295f588619..b722389b268d 100644
--- a/media-tv/v4l-utils/v4l-utils-1.6.2.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.6.2.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/media-tv/v4l-utils/v4l-utils-1.6.2.ebuild,v 1.3 2014/12/03 08:45:47 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/v4l-utils/v4l-utils-1.6.2.ebuild,v 1.5 2015/06/28 09:16:05 zlogene Exp $
 
 EAPI=5
 inherit eutils udev
@@ -11,7 +11,7 @@ SRC_URI="http://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ppc x86"
 IUSE="qt4 udev"
 
 RDEPEND=">=media-libs/libv4l-${PV}
diff --git a/media-video/aegisub/aegisub-3.1.3.ebuild b/media-video/aegisub/aegisub-3.1.3.ebuild
index 83f59a9fa54d..8946dcedbe86 100644
--- a/media-video/aegisub/aegisub-3.1.3.ebuild
+++ b/media-video/aegisub/aegisub-3.1.3.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/media-video/aegisub/aegisub-3.1.3.ebuild,v 1.2 2014/07/18 08:50:30 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/aegisub/aegisub-3.1.3.ebuild,v 1.3 2015/06/28 10:24:29 zlogene Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ SRC_URI="http://ftp.aegisub.org/pub/releases/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell"
 
 REQUIRED_USE="
diff --git a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild b/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
index 243fad0fca6c..d4ac465135e0 100644
--- a/media-video/ffmpeg/ffmpeg-2.6.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.6.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/media-video/ffmpeg/ffmpeg-2.6.3.ebuild,v 1.4 2015/06/14 19:42:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.6.3.ebuild,v 1.5 2015/06/28 10:20:29 zlogene Exp $
 
 EAPI="5"
 
@@ -55,7 +55,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index ba1bf53f93df..92e475524ec3 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-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/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.190 2015/05/29 09:45:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.191 2015/06/26 14:42:25 aballier Exp $
 
 EAPI="5"
 
@@ -90,8 +90,9 @@ FFMPEG_FLAG_MAP=(
 # Same as above but for encoders, i.e. they do something only with USE=encode.
 FFMPEG_ENCODER_FLAG_MAP=(
 	aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame
-	aacplus:libaacplus faac:libfaac theora:libtheora twolame:libtwolame
-	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
+	aacplus:libaacplus faac:libfaac snappy:libsnappy theora:libtheora
+	twolame:libtwolame wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265
+	xvid:libxvid
 )
 
 IUSE="
@@ -164,6 +165,7 @@ RDEPEND="
 		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
 		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
 		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		snappy? ( >=app-arch/snappy-1.1.2-r1[${MULTILIB_USEDEP}] )
 		theora? (
 			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
 			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index e432f7bebad0..0e878c5973b5 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -42,6 +42,7 @@
 	<flag name="quvi">Adds support for playing media from Internet services using the quvi project.</flag>
 	<flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag>
 	<flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
+	<flag name="snappy">Enable <pkg>app-arch/snappy</pkg> support. Required for e.g. Vidvox Hap encoder.</flag>
 	<flag name="ssh">Enable SSH/sftp support via <pkg>net-libs/libssh</pkg>.</flag>
 	<flag name="twolame">Enables MP2 encoding via <pkg>media-sound/twolame</pkg> as an alternative to the internal encoder.</flag>
 	<flag name="vis"> Adds support for SIMD optimizations for UltraSPARC processors.</flag>
diff --git a/media-video/motion/motion-3.2.12-r3.ebuild b/media-video/motion/motion-3.2.12-r3.ebuild
index d679d9997c79..3190c542f7b1 100644
--- a/media-video/motion/motion-3.2.12-r3.ebuild
+++ b/media-video/motion/motion-3.2.12-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/media-video/motion/motion-3.2.12-r3.ebuild,v 1.1 2015/06/24 20:08:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/motion/motion-3.2.12-r3.ebuild,v 1.3 2015/06/28 11:43:30 zlogene Exp $
 
 EAPI=5
 inherit autotools eutils readme.gentoo user
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ppc x86"
 IUSE="ffmpeg libav mysql postgres +v4l"
 
 RDEPEND="
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 86226543037b..2ec7aed21982 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 26 Jun 2015 09:37:06 +0000
+Sun, 28 Jun 2015 12:06:54 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 86226543037b..2ec7aed21982 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 26 Jun 2015 09:37:06 +0000
+Sun, 28 Jun 2015 12:06:54 +0000
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.12.1-r1 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.12.1-r1
index c776a620bf00..b20ba0fd54e9 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.12.1-r1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.12.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=app-accessibility/at-spi2-core-2.11.2[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(-)?] >=dev-libs/atk-2.11.90[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(-)?] >=dev-libs/glib-2.32:2[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(-)?] >=sys-apps/dbus-1.5[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(-)?] !<gnome-extra/at-spi-1.32.0-r1 abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20140508-r3 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.12/at-spi2-atk-2.12.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=1d69fdf8700037c94b62593f7da1bce9
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.14.1 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.14.1
index d68708577fae..84bdaf65f5b8 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.14.1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.14.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=app-accessibility/at-spi2-core-2.11.2[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(-)?] >=dev-libs/atk-2.11.90[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(-)?] >=dev-libs/glib-2.32:2[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(-)?] >=sys-apps/dbus-1.5[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(-)?] !<gnome-extra/at-spi-1.32.0-r1 abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20140508-r3 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.14/at-spi2-atk-2.14.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=a171a3c777c5a3dec3d779ed4003d9aa
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.16.0 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.16.0
index e38666d39d8b..c1e295d5962a 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.16.0
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=app-accessibility/at-spi2-core-2.15.5[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(-)?] >=dev-libs/atk-2.15.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(-)?] >=dev-libs/glib-2.32:2[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(-)?] >=sys-apps/dbus-1.5[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(-)?] !<gnome-extra/at-spi-1.32.0-r1 abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20140508-r3 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.16/at-spi2-atk-2.16.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=23f508cce67401e0629445415b3affd0
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.16.0-r1 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.16.0-r1
index 8e369cec3373..47312131fa0d 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.16.0-r1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.16.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=app-accessibility/at-spi2-core-2.15.5[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(-)?] >=dev-libs/atk-2.15.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(-)?] >=dev-libs/glib-2.32:2[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(-)?] >=sys-apps/dbus-1.5[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(-)?] !<gnome-extra/at-spi-1.32.0-r1 abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20140508-r3 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.16/at-spi2-atk-2.16.0.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bb6bc4a8f6505720d98d77c96f0e4d54
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.12.0-r1 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.12.0-r1
index 942361941a2a..9d5267c67c3a 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.12.0-r1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.12.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2[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(-)?] >=sys-apps/dbus-1[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(-)?] x11-libs/libSM[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(-)?] x11-libs/libXi[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(-)?] x11-libs/libXtst[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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) X? ( x11-libs/libX11[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-gtklibs-20140508-r3 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-core/2.12/at-spi2-core-2.12.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=caade3c18fdd67100d404225b4db95a5
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.14.1 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.14.1
index e8000c051dbf..abfacdefe8bb 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.14.1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.14.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2[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(-)?] >=sys-apps/dbus-1[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(-)?] x11-libs/libSM[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(-)?] x11-libs/libXi[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(-)?] x11-libs/libXtst[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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) X? ( x11-libs/libX11[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-gtklibs-20140508-r3 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-core/2.14/at-spi2-core-2.14.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c72b5081e5c537a2ab90d4eca057d769
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.16.0 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.16.0
index 43a19835ea4b..3daaa2bddf80 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.16.0
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2[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(-)?] >=sys-apps/dbus-1[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(-)?] x11-libs/libSM[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(-)?] x11-libs/libXi[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(-)?] x11-libs/libXtst[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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.6 ) X? ( x11-libs/libX11[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-gtklibs-20140508-r3 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-core/2.16/at-spi2-core-2.16.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d71b3c60334e19339b6e61d08604c21d
diff --git a/metadata/md5-cache/app-accessibility/flite-1.4-r4 b/metadata/md5-cache/app-accessibility/flite-1.4-r4
index 6ae609eaa759..df7789390108 100644
--- a/metadata/md5-cache/app-accessibility/flite-1.4-r4
+++ b/metadata/md5-cache/app-accessibility/flite-1.4-r4
@@ -9,5 +9,5 @@ LICENSE=BSD freetts public-domain regexp-UofT BSD-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[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
 SRC_URI=http://www.speech.cs.cmu.edu/flite/packed/flite-1.4/flite-1.4-release.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6751ccf29bb5b6ceb0308053daf46c7a
diff --git a/metadata/md5-cache/app-admin/ansible-1.9.2 b/metadata/md5-cache/app-admin/ansible-1.9.2
new file mode 100644
index 000000000000..d6066ec0deae
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-1.9.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( 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 dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/passlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-vcs/git ) 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=test python_targets_python2_7
+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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible/ansible-1.9.2.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=168a83803046be56aca8173122d40ea4
diff --git a/metadata/md5-cache/app-admin/elektra-0.7.1-r5 b/metadata/md5-cache/app-admin/elektra-0.7.1-r5
index 2790b1cedfd6..22b41a69cc02 100644
--- a/metadata/md5-cache/app-admin/elektra-0.7.1-r5
+++ b/metadata/md5-cache/app-admin/elektra-0.7.1-r5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/libxml2[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
 SRC_URI=ftp://ftp.markus-raab.org/elektra/elektra-0.7.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=3aaca7ac2b5d8065c88886bbdf81c44f
diff --git a/metadata/md5-cache/app-admin/elektra-0.8.3-r3 b/metadata/md5-cache/app-admin/elektra-0.8.3-r3
index 9949c1a75dff..698a05514594 100644
--- a/metadata/md5-cache/app-admin/elektra-0.8.3-r3
+++ b/metadata/md5-cache/app-admin/elektra-0.8.3-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.markus-raab.org/elektra/releases/elektra-0.8.3.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=5bc5c1b06109c5b7e6c783dba0facfcf
diff --git a/metadata/md5-cache/app-admin/elektra-0.8.6 b/metadata/md5-cache/app-admin/elektra-0.8.6
index c0b2a4d40dea..533f8647a061 100644
--- a/metadata/md5-cache/app-admin/elektra-0.8.6
+++ b/metadata/md5-cache/app-admin/elektra-0.8.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.markus-raab.org/elektra/releases/elektra-0.8.6.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8ae06f6a1a5ec49ce0515fa6b580ca2f
diff --git a/metadata/md5-cache/app-admin/elektra-0.8.7 b/metadata/md5-cache/app-admin/elektra-0.8.7
index 2d55821658a1..c457f1b6386c 100644
--- a/metadata/md5-cache/app-admin/elektra-0.8.7
+++ b/metadata/md5-cache/app-admin/elektra-0.8.7
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.markus-raab.org/elektra/releases/elektra-0.8.7.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f54ad3220e6cbe2cfe0bd5eb1bf9cdc8
diff --git a/metadata/md5-cache/app-admin/fam-2.7.0-r7 b/metadata/md5-cache/app-admin/fam-2.7.0-r7
index b04b4d01d4a7..650ae78a75e7 100644
--- a/metadata/md5-cache/app-admin/fam-2.7.0-r7
+++ b/metadata/md5-cache/app-admin/fam-2.7.0-r7
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=|| ( net-nds/rpcbind >=net-nds/portmap-5b-r6 ) !app-admin/gamin
 SLOT=0
 SRC_URI=ftp://oss.sgi.com/projects/fam/download/stable/fam-2.7.0.tar.gz mirror://debian/pool/main/f/fam/fam_2.7.0-17.diff.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=5fb8b9934ba5e2ec8c78df7a296a3f4a
diff --git a/metadata/md5-cache/app-admin/gamin-0.1.10-r1 b/metadata/md5-cache/app-admin/gamin-0.1.10-r1
index c56aa1377752..8e62fad2a0bb 100644
--- a/metadata/md5-cache/app-admin/gamin-0.1.10-r1
+++ b/metadata/md5-cache/app-admin/gamin-0.1.10-r1
@@ -8,5 +8,5 @@ LICENSE=LGPL-2
 PDEPEND=>=app-admin/gam-server-0.1.10
 RDEPEND=!app-admin/fam >=dev-libs/libgamin-0.1.10-r4[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
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=62680804efe13fbed4f9aea04e4856ea
diff --git a/metadata/md5-cache/app-arch/bzip2-1.0.6-r4 b/metadata/md5-cache/app-arch/bzip2-1.0.6-r4
index 235597cf06a2..f3ba212da9f7 100644
--- a/metadata/md5-cache/app-arch/bzip2-1.0.6-r4
+++ b/metadata/md5-cache/app-arch/bzip2-1.0.6-r4
@@ -8,5 +8,5 @@ LICENSE=BZIP2
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=28d9e0efc76f089d36fea9c97d4f9ff7
diff --git a/metadata/md5-cache/app-arch/bzip2-1.0.6-r6 b/metadata/md5-cache/app-arch/bzip2-1.0.6-r6
index cdeb06bcd5ee..73b6502e5c66 100644
--- a/metadata/md5-cache/app-arch/bzip2-1.0.6-r6
+++ b/metadata/md5-cache/app-arch/bzip2-1.0.6-r6
@@ -8,5 +8,5 @@ LICENSE=BZIP2
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1409137256f698d74afbfc7697172298
diff --git a/metadata/md5-cache/app-arch/bzip2-1.0.6-r7 b/metadata/md5-cache/app-arch/bzip2-1.0.6-r7
index 0d11aa27f016..c9030afffde0 100644
--- a/metadata/md5-cache/app-arch/bzip2-1.0.6-r7
+++ b/metadata/md5-cache/app-arch/bzip2-1.0.6-r7
@@ -8,5 +8,5 @@ LICENSE=BZIP2
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=952dccfbdc67c20f65c42f985bef019f
diff --git a/metadata/md5-cache/app-arch/lz4-0_p120 b/metadata/md5-cache/app-arch/lz4-0_p120
index e764ffd1ce82..994ffc174b0f 100644
--- a/metadata/md5-cache/app-arch/lz4-0_p120
+++ b/metadata/md5-cache/app-arch/lz4-0_p120
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc
 LICENSE=BSD-2 GPL-2
 SLOT=0
 SRC_URI=https://github.com/Cyan4973/lz4/archive/r120.tar.gz -> lz4-r120.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a77eeb6d1bfd8f63f2ee321fd9893aa1
diff --git a/metadata/md5-cache/app-arch/lz4-9999 b/metadata/md5-cache/app-arch/lz4-9999
index 26ab860efcd7..dcb524c78b18 100644
--- a/metadata/md5-cache/app-arch/lz4-9999
+++ b/metadata/md5-cache/app-arch/lz4-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://code.google.com/p/lz4/
 IUSE=test 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
 LICENSE=BSD-2 GPL-2
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ad7d7007f930c4002c966791221249e1
diff --git a/metadata/md5-cache/app-arch/snappy-1.1.2-r1 b/metadata/md5-cache/app-arch/snappy-1.1.2-r1
index 6da11d0f0f09..3f961b9443ed 100644
--- a/metadata/md5-cache/app-arch/snappy-1.1.2-r1
+++ b/metadata/md5-cache/app-arch/snappy-1.1.2-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~radhermit/dist/snappy-1.1.2.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ff1533cd9ae6246ba0ce904b451b9a91
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.0.5-r1 b/metadata/md5-cache/app-arch/xz-utils-5.0.5-r1
index 8cfbae80f334..28dd7ffaf5da 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.0.5-r1
+++ b/metadata/md5-cache/app-arch/xz-utils-5.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=public-domain LGPL-2.1+ GPL-2+
 RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
 SLOT=0
 SRC_URI=http://tukaani.org/xz/xz-5.0.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ea8d44fa19fd4fa2902da36fc4ec9030
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.0.7 b/metadata/md5-cache/app-arch/xz-utils-5.0.7
index 796dac3f3fc2..5a2fb14ee2ab 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.0.7
+++ b/metadata/md5-cache/app-arch/xz-utils-5.0.7
@@ -9,5 +9,5 @@ LICENSE=public-domain LGPL-2.1+ GPL-2+
 RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
 SLOT=0
 SRC_URI=http://tukaani.org/xz/xz-5.0.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=11c6fdf15b9f3516156caa5798c9e595
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.0.8 b/metadata/md5-cache/app-arch/xz-utils-5.0.8
index 8985e734a4b2..26bc30b3bba9 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.0.8
+++ b/metadata/md5-cache/app-arch/xz-utils-5.0.8
@@ -9,5 +9,5 @@ LICENSE=public-domain LGPL-2.1+ GPL-2+
 RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
 SLOT=0
 SRC_URI=http://tukaani.org/xz/xz-5.0.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e52d8ff5e4a78dd5907fe822db325279
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.0 b/metadata/md5-cache/app-arch/xz-utils-5.2.0
index 08d8edfb0427..2be4e49e75b0 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.0
+++ b/metadata/md5-cache/app-arch/xz-utils-5.2.0
@@ -9,5 +9,5 @@ LICENSE=public-domain LGPL-2.1+ GPL-2+
 RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
 SLOT=0
 SRC_URI=http://tukaani.org/xz/xz-5.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=fd000704506639dcfc9cb4d70e5cca29
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.1-r1 b/metadata/md5-cache/app-arch/xz-utils-5.2.1-r1
index 0024b0814098..691e41452b28 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.1-r1
+++ b/metadata/md5-cache/app-arch/xz-utils-5.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=public-domain LGPL-2.1+ GPL-2+
 RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
 SLOT=0
 SRC_URI=http://tukaani.org/xz/xz-5.2.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1c58d3bacf6529f042f070149a144947
diff --git a/metadata/md5-cache/app-arch/xz-utils-9999 b/metadata/md5-cache/app-arch/xz-utils-9999
index 9bb613edaae9..1c8fe6e6af8f 100644
--- a/metadata/md5-cache/app-arch/xz-utils-9999
+++ b/metadata/md5-cache/app-arch/xz-utils-9999
@@ -7,5 +7,5 @@ IUSE=elibc_FreeBSD nls static-libs +threads abi_x86_32 abi_x86_64 abi_x86_x32 ab
 LICENSE=public-domain LGPL-2.1+ GPL-2+
 RDEPEND=!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f9b23c0e6ffa8dc0ddff60cf1e6f3ef0
diff --git a/metadata/md5-cache/app-backup/deja-dup-32.0-r1 b/metadata/md5-cache/app-backup/deja-dup-32.0-r1
index b61718528aa5..923d27cc836a 100644
--- a/metadata/md5-cache/app-backup/deja-dup-32.0-r1
+++ b/metadata/md5-cache/app-backup/deja-dup-32.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=app-crypt/libsecret[vala] >=dev-libs/glib-2.34:2 >=dev-libs/libpeas-1.0 >=x11-libs/gtk+-3.6:3 >=x11-libs/libnotify-0.7 >=app-backup/duplicity-0.6.23 dev-libs/dbus-glib nautilus? ( gnome-base/nautilus ) app-text/yelp-tools || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) dev-perl/Locale-gettext virtual/pkgconfig dev-util/intltool sys-devel/gettext sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=app-crypt/libsecret[vala] >=dev-libs/glib-2.34:2 >=dev-libs/libpeas-1.0 >=x11-libs/gtk+-3.10:3 >=x11-libs/libnotify-0.7 >=app-backup/duplicity-0.6.23 dev-libs/dbus-glib nautilus? ( gnome-base/nautilus ) app-text/yelp-tools || ( dev-lang/vala:0.24 dev-lang/vala:0.22 ) dev-perl/Locale-gettext virtual/pkgconfig dev-util/intltool sys-devel/gettext sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Simple backup tool using duplicity back-end
 EAPI=5
 HOMEPAGE=https://launchpad.net/deja-dup/
 IUSE=nautilus test debug
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=app-crypt/libsecret[vala] >=dev-libs/glib-2.34:2 >=dev-libs/libpeas-1.0 >=x11-libs/gtk+-3.6:3 >=x11-libs/libnotify-0.7 >=app-backup/duplicity-0.6.23 dev-libs/dbus-glib nautilus? ( gnome-base/nautilus ) gnome-base/dconf gnome-base/gvfs[fuse]
+RDEPEND=app-crypt/libsecret[vala] >=dev-libs/glib-2.34:2 >=dev-libs/libpeas-1.0 >=x11-libs/gtk+-3.10:3 >=x11-libs/libnotify-0.7 >=app-backup/duplicity-0.6.23 dev-libs/dbus-glib nautilus? ( gnome-base/nautilus ) gnome-base/dconf gnome-base/gvfs[fuse]
 RESTRICT=test
 SLOT=0
 SRC_URI=http://launchpad.net/deja-dup/32/32.0/+download/deja-dup-32.0.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=dabec979ffaf71b6b6f8e63e28ae512f
+_md5_=d3037f237f865245ae5949837bea4be3
diff --git a/metadata/md5-cache/app-backup/deja-dup-34.0 b/metadata/md5-cache/app-backup/deja-dup-34.0
index e3deb06f26b8..fb026b449b85 100644
--- a/metadata/md5-cache/app-backup/deja-dup-34.0
+++ b/metadata/md5-cache/app-backup/deja-dup-34.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=app-crypt/libsecret[vala] >=dev-libs/glib-2.34:2 >=dev-libs/libpeas-1.0 >=x11-libs/gtk+-3.6:3 >=x11-libs/libnotify-0.7 >=app-backup/duplicity-0.6.23 dev-libs/dbus-glib nautilus? ( gnome-base/nautilus ) app-text/yelp-tools || ( dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) dev-perl/Locale-gettext virtual/pkgconfig dev-util/intltool sys-devel/gettext sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=app-crypt/libsecret[vala] >=dev-libs/glib-2.34:2 >=dev-libs/libpeas-1.0 >=x11-libs/gtk+-3.10:3 >=x11-libs/libnotify-0.7 >=app-backup/duplicity-0.6.23 dev-libs/dbus-glib nautilus? ( gnome-base/nautilus ) app-text/yelp-tools || ( dev-lang/vala:0.28 dev-lang/vala:0.26 dev-lang/vala:0.24 dev-lang/vala:0.22 ) dev-perl/Locale-gettext virtual/pkgconfig dev-util/intltool sys-devel/gettext sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Simple backup tool using duplicity back-end
 EAPI=5
 HOMEPAGE=https://launchpad.net/deja-dup/
 IUSE=nautilus test debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=app-crypt/libsecret[vala] >=dev-libs/glib-2.34:2 >=dev-libs/libpeas-1.0 >=x11-libs/gtk+-3.6:3 >=x11-libs/libnotify-0.7 >=app-backup/duplicity-0.6.23 dev-libs/dbus-glib nautilus? ( gnome-base/nautilus ) gnome-base/dconf gnome-base/gvfs[fuse]
+RDEPEND=app-crypt/libsecret[vala] >=dev-libs/glib-2.34:2 >=dev-libs/libpeas-1.0 >=x11-libs/gtk+-3.10:3 >=x11-libs/libnotify-0.7 >=app-backup/duplicity-0.6.23 dev-libs/dbus-glib nautilus? ( gnome-base/nautilus ) gnome-base/dconf gnome-base/gvfs[fuse]
 RESTRICT=test
 SLOT=0
 SRC_URI=http://launchpad.net/deja-dup/34/34.0/+download/deja-dup-34.0.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=77f43943fe41f5cc0e15d0b01d32b22a
+_md5_=3c8167a2812aa10dcda0c9fcff818aec
diff --git a/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r1 b/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r1
index 41480be53b7a..59e3fe43b0ec 100644
--- a/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r1
+++ b/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Local/remote mirroring+incremental backup
 EAPI=5
 HOMEPAGE=http://rdiff-backup.nongnu.org/
 IUSE=examples python_targets_python2_7
-KEYWORDS=~alpha ~amd64 arm ~mips ~ppc ppc64 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha ~amd64 arm ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=dev-python/pyxattr[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pylibacl[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://savannah.nongnu.org/download/rdiff-backup/rdiff-backup-1.3.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=a7c790b3406b5970c3856bc33c67e4c2
+_md5_=be05d0b0e9f57d7c5044882ac69059cc
diff --git a/metadata/md5-cache/app-cdr/bashburn-3.0.1 b/metadata/md5-cache/app-cdr/bashburn-3.0.1
deleted file mode 100644
index 23079143f1f5..000000000000
--- a/metadata/md5-cache/app-cdr/bashburn-3.0.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=cd burning shell script
-EAPI=2
-HOMEPAGE=http://bashburn.sourceforge.net
-IUSE=dvdr
-KEYWORDS=amd64 ppc ~ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=virtual/cdrtools app-cdr/cdrdao dvdr? ( app-cdr/dvd+rw-tools ) media-sound/mpg123 media-sound/lame media-sound/vorbis-tools media-sound/normalize media-libs/flac virtual/eject app-shells/bash
-SLOT=0
-SRC_URI=http://bashburn.dose.se/index.php?s=file_download&id=3 -> BashBurn-3.0.1.tar.gz
-_md5_=e81273796856f4bdef1b99812e001054
diff --git a/metadata/md5-cache/app-cdr/burn-cd-1.8.0 b/metadata/md5-cache/app-cdr/burn-cd-1.8.0
deleted file mode 100644
index 35817acaf8f0..000000000000
--- a/metadata/md5-cache/app-cdr/burn-cd-1.8.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Smart console frontend for virtual/cdrtools and dvd+rw-tools
-HOMEPAGE=http://burn-cd.sourceforge.net
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=dev-lang/python virtual/cdrtools app-cdr/dvd+rw-tools
-SLOT=0
-SRC_URI=mirror://sourceforge/burn-cd/burn-cd-1.8.0.gz
-_md5_=3652a1561b47531c64974a4d4de438fc
diff --git a/metadata/md5-cache/app-cdr/cdcover-0.7.4 b/metadata/md5-cache/app-cdr/cdcover-0.7.4
deleted file mode 100644
index 55f790292f5d..000000000000
--- a/metadata/md5-cache/app-cdr/cdcover-0.7.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND==dev-lang/python-2* =dev-lang/python-2*[tk]
-DESCRIPTION=cdcover allows the creation of inlay-sheets for jewel cd-cases
-EAPI=2
-HOMEPAGE=http://cdcover.sourceforge.net
-IUSE=cddb
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=cddb? ( dev-python/cddb-py ) media-sound/cd-discid =dev-lang/python-2* =dev-lang/python-2*[tk]
-SLOT=0
-SRC_URI=mirror://sourceforge/cdcover/cdcover-0.7.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=f06495b9e7a54710152a522216830295
diff --git a/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1 b/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1
deleted file mode 100644
index 0fc43be4817e..000000000000
--- a/metadata/md5-cache/app-cdr/dvd+rw-tools-7.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=virtual/cdrtools sys-devel/m4
-DESCRIPTION=A set of tools for DVD+RW/-RW drives
-HOMEPAGE=http://fy.chalmers.se/~appro/linux/DVD+RW/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=virtual/cdrtools
-SLOT=0
-SRC_URI=http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-7.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=f19e14f99eb44a60b27381ef947e4bd2
diff --git a/metadata/md5-cache/app-cdr/gtkcdlabel-1.14 b/metadata/md5-cache/app-cdr/gtkcdlabel-1.14
deleted file mode 100644
index af278c3cfb7c..000000000000
--- a/metadata/md5-cache/app-cdr/gtkcdlabel-1.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=app-cdr/cdlabelgen-4 dev-python/pygtk || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=a GUI frontend to cdlabelgen which is a program that can generate a variety of CD tray covers
-EAPI=3
-HOMEPAGE=http://gtkcdlabel.sourceforge.net
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-cdr/cdlabelgen-4 dev-python/pygtk || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=mirror://sourceforge/gtkcdlabel/gtkcdlabel-1.14.tar.bz2
-_eclasses_=multilib	62927b3db3a589b0806255f3a002d5d3	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=e7d44000ca96bb63095eab93f46e4509
diff --git a/metadata/md5-cache/app-cdr/iat-0.1.3 b/metadata/md5-cache/app-cdr/iat-0.1.3
deleted file mode 100644
index d50e90912689..000000000000
--- a/metadata/md5-cache/app-cdr/iat-0.1.3
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=BIN, MDF, PDI, CDI, NRG, and B5I converters
-HOMEPAGE=http://iat.berlios.de
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://berlios/iat/iat-0.1.3-src.tar.bz2
-_md5_=fbb0d61c3a082a6f05c87736cab55ee9
diff --git a/metadata/md5-cache/app-cdr/qpxtool-0.7.0-r1 b/metadata/md5-cache/app-cdr/qpxtool-0.7.0-r1
deleted file mode 100644
index 346bb3bf5845..000000000000
--- a/metadata/md5-cache/app-cdr/qpxtool-0.7.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-qt/qtgui:4 media-libs/libpng
-DESCRIPTION=CD/DVD quality checking utilities
-EAPI=2
-HOMEPAGE=http://qpxtool.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:4 media-libs/libpng
-SLOT=0
-SRC_URI=mirror://sourceforge/qpxtool/qpxtool-0.7.0.tar.bz2
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	qmake-utils	8557b23f27697843c242ff27aaa99448	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=0083149afde748526274dfe94996bc60
diff --git a/metadata/md5-cache/app-cdr/uif2iso-0.1.4 b/metadata/md5-cache/app-cdr/uif2iso-0.1.4
deleted file mode 100644
index 7c6833e2e844..000000000000
--- a/metadata/md5-cache/app-cdr/uif2iso-0.1.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Converts MagicISO CD-images to iso
-HOMEPAGE=http://aluigi.org/mytoolz.htm#uif2iso
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/openssl sys-libs/zlib
-SLOT=0
-SRC_URI=mirror://gentoo/uif2iso-0.1.4.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=036e7035229621c873d85d2cdf33b9c7
diff --git a/metadata/md5-cache/app-crypt/aespipe-2.4c b/metadata/md5-cache/app-crypt/aespipe-2.4c
deleted file mode 100644
index 7f1f371a5387..000000000000
--- a/metadata/md5-cache/app-crypt/aespipe-2.4c
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Encrypts data from stdin to stdout
-HOMEPAGE=http://loop-aes.sourceforge.net
-IUSE=static
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=GPL-2
-RDEPEND=app-arch/sharutils
-SLOT=0
-SRC_URI=http://loop-aes.sourceforge.net/aespipe/aespipe-v2.4c.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=e807c47e819f954f5278cfca97d9c361
diff --git a/metadata/md5-cache/app-crypt/gnupg-pkcs11-scd-0.7.2 b/metadata/md5-cache/app-crypt/gnupg-pkcs11-scd-0.7.2
deleted file mode 100644
index 91e903b60aee..000000000000
--- a/metadata/md5-cache/app-crypt/gnupg-pkcs11-scd-0.7.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND==dev-libs/libassuan-2* >=dev-libs/libgcrypt-1.2.2:0 >=dev-libs/libgpg-error-1.3 >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.02 virtual/pkgconfig
-DESCRIPTION=PKCS#11 support for GnuPG
-EAPI=3
-HOMEPAGE=http://gnupg-pkcs11.sourceforge.net
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND==dev-libs/libassuan-2* >=dev-libs/libgcrypt-1.2.2:0 >=dev-libs/libgpg-error-1.3 >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.02
-SLOT=0
-SRC_URI=mirror://sourceforge/gnupg-pkcs11/gnupg-pkcs11-scd-0.7.2.tar.bz2
-_md5_=7d6e8bed59459b6d5102e22187df0d4a
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.5.5 b/metadata/md5-cache/app-crypt/gpgme-1.5.5
index 4d94f1943b50..7c4932586563 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.5.5
+++ b/metadata/md5-cache/app-crypt/gpgme-1.5.5
@@ -4,10 +4,10 @@ DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
 EAPI=5
 HOMEPAGE=http://www.gnupg.org/related_software/gpgme
 IUSE=common-lisp static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-crypt/gnupg >=dev-libs/libassuan-2.0.2 >=dev-libs/libgpg-error-1.11
 SLOT=1/11
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.5.5.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=50f5958ce104905fadd8880becc5cbec
+_md5_=e202948625afe64cb48de2abb15c4193
diff --git a/metadata/md5-cache/app-crypt/heimdal-1.5.3-r2 b/metadata/md5-cache/app-crypt/heimdal-1.5.3-r2
index 11c85b7fb832..571253a92bac 100644
--- a/metadata/md5-cache/app-crypt/heimdal-1.5.3-r2
+++ b/metadata/md5-cache/app-crypt/heimdal-1.5.3-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ssl? ( >=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(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) !berkdb? ( >=sys-libs/gdbm-1.10-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(-)?] ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.8.2[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(-)?] >=sys-libs/e2fsprogs-libs-1.42.9[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(-)?] sys-libs/ncurses >=sys-libs/readline-6.2_p5-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(-)?] afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl selinux? ( sec-policy/selinux-kerberos )
 SLOT=0
 SRC_URI=http://www.h5l.org/dist/src/heimdal-1.5.3.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=1c9c032ba8e1f68e887eead9aa99f7a9
diff --git a/metadata/md5-cache/app-crypt/hmaccalc-0.9.12 b/metadata/md5-cache/app-crypt/hmaccalc-0.9.12
deleted file mode 100644
index 0c9532859603..000000000000
--- a/metadata/md5-cache/app-crypt/hmaccalc-0.9.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/nss sys-devel/prelink
-DESCRIPTION=Tools for computing and checking HMAC values for files
-EAPI=3
-HOMEPAGE=https://fedorahosted.org/hmaccalc/
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/nss sys-devel/prelink
-SLOT=0
-SRC_URI=https://fedorahosted.org/released/hmaccalc/hmaccalc-0.9.12.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=8cc2c61e4cbf00894d7609169d9aef96
diff --git a/metadata/md5-cache/app-crypt/kencfs-1.5.0 b/metadata/md5-cache/app-crypt/kencfs-1.5.0
index 2b4030808726..7ca891154fdb 100644
--- a/metadata/md5-cache/app-crypt/kencfs-1.5.0
+++ b/metadata/md5-cache/app-crypt/kencfs-1.5.0
@@ -3,10 +3,10 @@ DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 kde-base/kdelibs:4
 DESCRIPTION=GUI frontend for encfs
 EAPI=5
 HOMEPAGE=http://kde-apps.org/content/show.php?content=134003
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 kde-base/kdelibs:4 kde-apps/kwalletd:4 sys-fs/encfs
 SLOT=0
 SRC_URI=http://kde-apps.org/CONTENT/content-files/134003-kencfs-1.5.0.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	qmake-utils	8557b23f27697843c242ff27aaa99448	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=965c4e6832b1e6ff79fe46e7828e855e
+_md5_=58c9bbb084df82bfe7e75c1abc9862d3
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.16 b/metadata/md5-cache/app-crypt/libsecret-0.16
deleted file mode 100644
index 78a85f74358d..000000000000
--- a/metadata/md5-cache/app-crypt/libsecret-0.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.32.0:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) introspection? ( >=dev-libs/gobject-introspection-1.29 ) dev-libs/libxslt dev-util/gdbus-codegen dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig test? ( dev-python/mock introspection? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-libs/gjs-1.32 dev-python/pygobject:3 ) ) vala? ( || ( dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=GObject library for accessing the freedesktop.org Secret Service API
-EAPI=5
-HOMEPAGE=https://live.gnome.org/Libsecret
-IUSE=+crypt debug +introspection test vala debug test
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
-LICENSE=LGPL-2.1+ Apache-2.0
-RDEPEND=>=dev-libs/glib-2.32.0:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) introspection? ( >=dev-libs/gobject-introspection-1.29 ) >=gnome-base/gnome-keyring-3
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libsecret/0.16/libsecret-0.16.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c81a5785ba1b6d16a47c02d63ee55beb
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.18 b/metadata/md5-cache/app-crypt/libsecret-0.18
index d3c55acb01ec..8c3457c95f59 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.18
+++ b/metadata/md5-cache/app-crypt/libsecret-0.18
@@ -6,9 +6,10 @@ HOMEPAGE=https://live.gnome.org/Libsecret
 IUSE=+crypt debug +introspection test vala debug test
 KEYWORDS=alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=LGPL-2.1+ Apache-2.0
-RDEPEND=>=dev-libs/glib-2.38:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) introspection? ( >=dev-libs/gobject-introspection-1.29 ) >=gnome-base/gnome-keyring-3
+PDEPEND=>=gnome-base/gnome-keyring-3
+RDEPEND=>=dev-libs/glib-2.38:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) introspection? ( >=dev-libs/gobject-introspection-1.29 )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsecret/0.18/libsecret-0.18.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0a9143c83c71557ba64fc2c84680d49a
+_md5_=475e83fbd3705afb7df882437aa27d1f
diff --git a/metadata/md5-cache/app-crypt/libsecret-0.18.2 b/metadata/md5-cache/app-crypt/libsecret-0.18.2
index 8804f2085af7..eda2ca9e73ad 100644
--- a/metadata/md5-cache/app-crypt/libsecret-0.18.2
+++ b/metadata/md5-cache/app-crypt/libsecret-0.18.2
@@ -6,9 +6,10 @@ HOMEPAGE=https://live.gnome.org/Libsecret
 IUSE=+crypt debug +introspection test vala debug test
 KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-fbsd
 LICENSE=LGPL-2.1+ Apache-2.0
-RDEPEND=>=dev-libs/glib-2.38:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) introspection? ( >=dev-libs/gobject-introspection-1.29 ) >=gnome-base/gnome-keyring-3
+PDEPEND=>=gnome-base/gnome-keyring-3
+RDEPEND=>=dev-libs/glib-2.38:2 crypt? ( >=dev-libs/libgcrypt-1.2.2:0= ) introspection? ( >=dev-libs/gobject-introspection-1.29 )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libsecret/0.18/libsecret-0.18.2.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2910d3fddab7d7c65d63a5c73cde79b5
+_md5_=67f0129e269450bd2eac52b832e498cf
diff --git a/metadata/md5-cache/app-crypt/mcrypt-2.6.8-r1 b/metadata/md5-cache/app-crypt/mcrypt-2.6.8-r1
deleted file mode 100644
index a5562982e807..000000000000
--- a/metadata/md5-cache/app-crypt/mcrypt-2.6.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libmcrypt-2.5.8 >=app-crypt/mhash-0.9.9 sys-libs/zlib
-DESCRIPTION=replacement of the old unix crypt(1)
-EAPI=2
-HOMEPAGE=http://mcrypt.sourceforge.net/
-IUSE=nls
-KEYWORDS=amd64 ppc sparc x86 ~x86-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libmcrypt-2.5.8 >=app-crypt/mhash-0.9.9 sys-libs/zlib
-SLOT=0
-SRC_URI=mirror://sourceforge/mcrypt/mcrypt-2.6.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=511ab25a1d4b12926f081e79c6142731
diff --git a/metadata/md5-cache/app-crypt/md4sum-0.02.03 b/metadata/md5-cache/app-crypt/md4sum-0.02.03
deleted file mode 100644
index d6a0060d8f4d..000000000000
--- a/metadata/md5-cache/app-crypt/md4sum-0.02.03
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=md4 and edonkey hash algorithm tool
-HOMEPAGE=http://absinth.dyndns.org/linux/c/
-KEYWORDS=~amd64 ~x86 ~ppc
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://absinth.dyndns.org/linux/c/md4sum-0.02.03.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=b4148198fd2d5764eec1e48c5be743c0
diff --git a/metadata/md5-cache/app-crypt/mhash-0.9.9-r1 b/metadata/md5-cache/app-crypt/mhash-0.9.9-r1
deleted file mode 100644
index a738e3508592..000000000000
--- a/metadata/md5-cache/app-crypt/mhash-0.9.9-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=library providing a uniform interface to a large number of hash algorithms
-HOMEPAGE=http://mhash.sourceforge.net/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/mhash/mhash-0.9.9.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=e485c3b46f0b1ca07c0bf9b22667cc00
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.13-r1 b/metadata/md5-cache/app-crypt/mit-krb5-1.13-r1
index b78636aff337..e6fb9887892a 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.13-r1
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.13-r1
@@ -9,5 +9,5 @@ LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 ||
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[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(-)?] || ( >=dev-libs/libverto-0.2.5[libev,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(-)?] >=dev-libs/libverto-0.2.5[libevent,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(-)?] >=dev-libs/libverto-0.2.5[tevent,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(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8[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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) pkinit? ( >=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(-)?] ) xinetd? ( sys-apps/xinetd ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) selinux? ( sec-policy/selinux-kerberos )
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13-signed.tar
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4c1a5b5c7af45bc7c424d85c536759ad
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.13.1 b/metadata/md5-cache/app-crypt/mit-krb5-1.13.1
index 96bda393c782..be491b49901d 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.13.1
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.13.1
@@ -9,5 +9,5 @@ LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 ||
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[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(-)?] || ( >=dev-libs/libverto-0.2.5[libev,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(-)?] >=dev-libs/libverto-0.2.5[libevent,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(-)?] >=dev-libs/libverto-0.2.5[tevent,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(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8[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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) pkinit? ( >=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(-)?] ) xinetd? ( sys-apps/xinetd ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) selinux? ( sec-policy/selinux-kerberos )
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.1-signed.tar
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=11fa9558941603d8595cbd852be09c77
diff --git a/metadata/md5-cache/app-crypt/mit-krb5-1.13.2 b/metadata/md5-cache/app-crypt/mit-krb5-1.13.2
index 86e048abe7b2..f2c924f389cf 100644
--- a/metadata/md5-cache/app-crypt/mit-krb5-1.13.2
+++ b/metadata/md5-cache/app-crypt/mit-krb5-1.13.2
@@ -4,10 +4,10 @@ DESCRIPTION=MIT Kerberos V
 EAPI=5
 HOMEPAGE=http://web.mit.edu/kerberos/www/
 IUSE=doc +keyutils openldap +pkinit selinux +threads test xinetd 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
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86
 LICENSE=openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )
 RDEPEND=!!app-crypt/heimdal >=sys-libs/e2fsprogs-libs-1.42.9[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(-)?] || ( >=dev-libs/libverto-0.2.5[libev,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(-)?] >=dev-libs/libverto-0.2.5[libevent,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(-)?] >=dev-libs/libverto-0.2.5[tevent,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(-)?] ) keyutils? ( >=sys-apps/keyutils-1.5.8[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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) pkinit? ( >=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(-)?] ) xinetd? ( sys-apps/xinetd ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) selinux? ( sec-policy/selinux-kerberos )
 SLOT=0
 SRC_URI=http://web.mit.edu/kerberos/dist/krb5/1.13/krb5-1.13.2-signed.tar
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=83a2c61911b697840ebe527b1d091295
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=0ff70f2c3aa3b3b9dce35dd88b832834
diff --git a/metadata/md5-cache/app-crypt/openvpn-blacklist-0.3 b/metadata/md5-cache/app-crypt/openvpn-blacklist-0.3
deleted file mode 100644
index f8686b9461c8..000000000000
--- a/metadata/md5-cache/app-crypt/openvpn-blacklist-0.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/python
-DESCRIPTION=Detection of weak openvpn keys produced by certain debian versions between 2006 and 2008
-HOMEPAGE=http://packages.debian.org/sid/openvpn-blacklist
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=mirror://debian/pool/main/o/openvpn-blacklist/openvpn-blacklist_0.3.tar.gz
-_md5_=e277073e68107b0025105a6c0b59d271
diff --git a/metadata/md5-cache/app-crypt/openvpn-blacklist-0.4 b/metadata/md5-cache/app-crypt/openvpn-blacklist-0.4
deleted file mode 100644
index 590ea9e35eb6..000000000000
--- a/metadata/md5-cache/app-crypt/openvpn-blacklist-0.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/python
-DESCRIPTION=Detection of weak openvpn keys produced by certain debian versions between 2006 and 2008
-HOMEPAGE=http://packages.debian.org/sid/openvpn-blacklist
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=mirror://debian/pool/main/o/openvpn-blacklist/openvpn-blacklist_0.4.tar.gz
-_md5_=cc333d377aaecbb848f71381c438e882
diff --git a/metadata/md5-cache/app-crypt/p11-kit-0.20.7 b/metadata/md5-cache/app-crypt/p11-kit-0.20.7
index 4757ddae19a8..cf2263e18b0b 100644
--- a/metadata/md5-cache/app-crypt/p11-kit-0.20.7
+++ b/metadata/md5-cache/app-crypt/p11-kit-0.20.7
@@ -10,5 +10,5 @@ RDEPEND=asn1? ( >=dev-libs/libtasn1-3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 REQUIRED_USE=trust? ( asn1 )
 SLOT=0
 SRC_URI=http://p11-glue.freedesktop.org/releases/p11-kit-0.20.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2c4a3ff25ff888658745fefd522ba6da
diff --git a/metadata/md5-cache/app-crypt/p11-kit-0.22.0 b/metadata/md5-cache/app-crypt/p11-kit-0.22.0
index b17b0d19a57b..6fe7ef636c98 100644
--- a/metadata/md5-cache/app-crypt/p11-kit-0.22.0
+++ b/metadata/md5-cache/app-crypt/p11-kit-0.22.0
@@ -10,5 +10,5 @@ RDEPEND=asn1? ( >=dev-libs/libtasn1-3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 REQUIRED_USE=trust? ( asn1 )
 SLOT=0
 SRC_URI=http://p11-glue.freedesktop.org/releases/p11-kit-0.22.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=afed59e5d996f7a24e50c43bab7d2dbf
diff --git a/metadata/md5-cache/app-crypt/p11-kit-0.22.1 b/metadata/md5-cache/app-crypt/p11-kit-0.22.1
index 7dc1e65d3a34..37df3b04951a 100644
--- a/metadata/md5-cache/app-crypt/p11-kit-0.22.1
+++ b/metadata/md5-cache/app-crypt/p11-kit-0.22.1
@@ -10,5 +10,5 @@ RDEPEND=asn1? ( >=dev-libs/libtasn1-3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 REQUIRED_USE=trust? ( asn1 )
 SLOT=0
 SRC_URI=http://p11-glue.freedesktop.org/releases/p11-kit-0.22.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b97444458d2dda16df6cb9026ff4d1c3
diff --git a/metadata/md5-cache/app-crypt/p11-kit-0.23.1 b/metadata/md5-cache/app-crypt/p11-kit-0.23.1
index f4b2ef42aa10..af5baa1dc857 100644
--- a/metadata/md5-cache/app-crypt/p11-kit-0.23.1
+++ b/metadata/md5-cache/app-crypt/p11-kit-0.23.1
@@ -10,5 +10,5 @@ RDEPEND=asn1? ( >=dev-libs/libtasn1-3.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 REQUIRED_USE=trust? ( asn1 )
 SLOT=0
 SRC_URI=http://p11-glue.freedesktop.org/releases/p11-kit-0.23.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=099851e8aa0156877cbed92f7f538e2f
diff --git a/metadata/md5-cache/app-crypt/qca-2.1.0.3 b/metadata/md5-cache/app-crypt/qca-2.1.0.3
index f42d26b7c85a..a3c4e7718c0b 100644
--- a/metadata/md5-cache/app-crypt/qca-2.1.0.3
+++ b/metadata/md5-cache/app-crypt/qca-2.1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Qt Cryptographic Architecture (QCA)
 EAPI=5
 HOMEPAGE=http://delta.affinix.com/qca/
 IUSE=botan debug doc examples gcrypt gpg logger nss +openssl pkcs11 +qt4 qt5 sasl softstore test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=LGPL-2.1
 RDEPEND=!app-crypt/qca-cyrus-sasl !app-crypt/qca-gnupg !app-crypt/qca-logger !app-crypt/qca-ossl !app-crypt/qca-pkcs11 botan? ( dev-libs/botan ) gcrypt? ( dev-libs/libgcrypt:= ) gpg? ( app-crypt/gnupg ) nss? ( dev-libs/nss ) openssl? ( dev-libs/openssl:0 ) pkcs11? ( dev-libs/openssl:0 dev-libs/pkcs11-helper ) qt4? ( dev-qt/qtcore:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtconcurrent:5 dev-qt/qtnetwork:5 ) sasl? ( dev-libs/cyrus-sasl:2 )
 REQUIRED_USE=|| ( qt4 qt5 )
 SLOT=2
 SRC_URI=mirror://kde/stable/qca-qt5/2.1.0.3/src/qca-qt5-2.1.0.3.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=f46187f970be45efdc99c6eba89f3a7d
+_md5_=61db4b6e969d1dd1fe0e96c77815efe2
diff --git a/metadata/md5-cache/app-crypt/seahorse-3.16.0 b/metadata/md5-cache/app-crypt/seahorse-3.16.0
deleted file mode 100644
index c2ba35698c48..000000000000
--- a/metadata/md5-cache/app-crypt/seahorse-3.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-crypt/gcr-3.11.91:= >=dev-libs/glib-2.10:2 >=x11-libs/gtk+-3.4:3 >=app-crypt/libsecret-0.16 >=net-libs/libsoup-2.33.92:2.4 x11-misc/shared-mime-info net-misc/openssh >=app-crypt/gpgme-1 >=app-crypt/gnupg-1.4 <app-crypt/gnupg-2.1 ldap? ( net-nds/openldap:= ) zeroconf? ( >=net-dns/avahi-0.6:= ) >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=A GNOME application for managing encryption keys
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Apps/Seahorse
-IUSE=debug ldap zeroconf
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2+ FDL-1.1+
-RDEPEND=>=app-crypt/gcr-3.11.91:= >=dev-libs/glib-2.10:2 >=x11-libs/gtk+-3.4:3 >=app-crypt/libsecret-0.16 >=net-libs/libsoup-2.33.92:2.4 x11-misc/shared-mime-info net-misc/openssh >=app-crypt/gpgme-1 >=app-crypt/gnupg-1.4 <app-crypt/gnupg-2.1 ldap? ( net-nds/openldap:= ) zeroconf? ( >=net-dns/avahi-0.6:= ) !<app-crypt/seahorse-plugins-2.91.0_pre20110114
-SLOT=0
-SRC_URI=mirror://gnome/sources/seahorse/3.16/seahorse-3.16.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=690860ee585523a5047b39f851ac3f8f
diff --git a/metadata/md5-cache/app-crypt/seahorse-3.16.0-r1 b/metadata/md5-cache/app-crypt/seahorse-3.16.0-r1
index 89c2c4c7cd38..fa24c9e81f50 100644
--- a/metadata/md5-cache/app-crypt/seahorse-3.16.0-r1
+++ b/metadata/md5-cache/app-crypt/seahorse-3.16.0-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-crypt/gcr-3.11.91:= >=dev-libs/glib-2.10:2 >=x11-libs/gtk+-3.4:3 >=app-crypt/libsecret-0.16 >=net-libs/libsoup-2.33.92:2.4 x11-misc/shared-mime-info net-misc/openssh >=app-crypt/gpgme-1 >=app-crypt/gnupg-2.0.12 ldap? ( net-nds/openldap:= ) zeroconf? ( >=net-dns/avahi-0.6:= ) >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=app-crypt/gcr-3.11.91:= >=dev-libs/glib-2.10:2 >=x11-libs/gtk+-3.4:3 >=app-crypt/libsecret-0.16 >=net-libs/libsoup-2.33.92:2.4 x11-misc/shared-mime-info net-misc/openssh >=app-crypt/gpgme-1 >=app-crypt/gnupg-2.0.12 ldap? ( net-nds/openldap:= ) zeroconf? ( >=net-dns/avahi-0.6:= ) app-text/yelp-tools >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=A GNOME application for managing encryption keys
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Seahorse
@@ -10,4 +10,4 @@ RDEPEND=>=app-crypt/gcr-3.11.91:= >=dev-libs/glib-2.10:2 >=x11-libs/gtk+-3.4:3 >
 SLOT=0
 SRC_URI=mirror://gnome/sources/seahorse/3.16/seahorse-3.16.0.tar.xz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=5f6c746964f67cdf3469380aaea896b3
+_md5_=71131f2382a2bff6a3c0aaf6241c387a
diff --git a/metadata/md5-cache/app-crypt/ssdeep-2.10 b/metadata/md5-cache/app-crypt/ssdeep-2.10
index a3ebf395fc2e..b75ed07c44fe 100644
--- a/metadata/md5-cache/app-crypt/ssdeep-2.10
+++ b/metadata/md5-cache/app-crypt/ssdeep-2.10
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/ssdeep/ssdeep-2.10.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=df54dbb5d793560308541f2329e6c35e
diff --git a/metadata/md5-cache/app-crypt/ssdeep-2.11.1 b/metadata/md5-cache/app-crypt/ssdeep-2.11.1
index c84f5c549e00..8eb39cb93c06 100644
--- a/metadata/md5-cache/app-crypt/ssdeep-2.11.1
+++ b/metadata/md5-cache/app-crypt/ssdeep-2.11.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/ssdeep/ssdeep-2.11.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a264d30605fdfc10a4cd99ec4b2fc529
diff --git a/metadata/md5-cache/app-crypt/ssdeep-2.12 b/metadata/md5-cache/app-crypt/ssdeep-2.12
index a23b137a9499..0061a60cd3c5 100644
--- a/metadata/md5-cache/app-crypt/ssdeep-2.12
+++ b/metadata/md5-cache/app-crypt/ssdeep-2.12
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/ssdeep/ssdeep-2.12.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=77e9cd70c82942d3dba1967df9854b62
diff --git a/metadata/md5-cache/app-crypt/ssdeep-2.13 b/metadata/md5-cache/app-crypt/ssdeep-2.13
index e7a2a64f90c4..d63f6b6a3c13 100644
--- a/metadata/md5-cache/app-crypt/ssdeep-2.13
+++ b/metadata/md5-cache/app-crypt/ssdeep-2.13
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/ssdeep/ssdeep-2.13.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=29448d12b1b23c0bd845becfe25a1d79
diff --git a/metadata/md5-cache/app-doc/edox-data-0.16.8_pre2 b/metadata/md5-cache/app-doc/edox-data-0.16.8_pre2
deleted file mode 100644
index f08590fe60e1..000000000000
--- a/metadata/md5-cache/app-doc/edox-data-0.16.8_pre2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=x11-wm/enlightenment-0.16.8
-DESCRIPTION=The Enlightenment online help
-HOMEPAGE=http://www.enlightenment.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=x11-wm/enlightenment-0.16.8
-SLOT=0
-SRC_URI=mirror://sourceforge/enlightenment/e16-docs-0.16.8-0.02.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=40a48cfdd9f3d03e4835eb7b20b3a4fb
diff --git a/metadata/md5-cache/app-editors/neovim-0.0.0_pre20150627 b/metadata/md5-cache/app-editors/neovim-0.0.0_pre20150627
new file mode 100644
index 000000000000..692cccdf916e
--- /dev/null
+++ b/metadata/md5-cache/app-editors/neovim-0.0.0_pre20150627
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/luajit:2 >=dev-libs/libtermkey-0.17 dev-libs/libvterm-neovim >=dev-libs/unibilium-1.1.1 >=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-0.6.0_pre20150220 dev-lua/lpeg dev-lua/messagepack virtual/libiconv virtual/libintl sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Vim's rebirth for the 21st century
+EAPI=5
+HOMEPAGE=https://github.com/neovim/neovim
+IUSE=perl python
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 vim
+RDEPEND=dev-lang/luajit:2 >=dev-libs/libtermkey-0.17 dev-libs/libvterm-neovim >=dev-libs/unibilium-1.1.1 >=dev-libs/libuv-1.2.0 >=dev-libs/msgpack-0.6.0_pre20150220 dev-lua/lpeg dev-lua/messagepack perl? ( dev-lang/perl ) python? ( dev-python/neovim-python-client )
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~yngwin/distfiles/neovim-0.0.0_pre20150627.tar.xz
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=f4b00b90e1c3361e425e61cf5e3cd749
diff --git a/metadata/md5-cache/app-emulation/wine-1.6.2 b/metadata/md5-cache/app-emulation/wine-1.6.2
index 937a093b7990..7bdeb9aca89e 100644
--- a/metadata/md5-cache/app-emulation/wine-1.6.2
+++ b/metadata/md5-cache/app-emulation/wine-1.6.2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.6.2.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.21/wine_gecko-2.21-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.21/wine_gecko-2.21-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.8.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=08dd764fa8afcf0292a2f118e4074c7a
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.0 b/metadata/md5-cache/app-emulation/wine-1.7.0
index 130bc208f8d9..f8461cd30dad 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.0
+++ b/metadata/md5-cache/app-emulation/wine-1.7.0
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.0.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.21/wine_gecko-2.21-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.21/wine_gecko-2.21-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.0.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=9bedd114ce68349b26b1ae7aa982c082
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.10 b/metadata/md5-cache/app-emulation/wine-1.7.10
index 9a57605470fa..3b7d9494b62f 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.10
+++ b/metadata/md5-cache/app-emulation/wine-1.7.10
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.10.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.10.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=8c8c3b50a6abf26e000eac7caf80619d
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.11 b/metadata/md5-cache/app-emulation/wine-1.7.11
index a1d685b64c19..ca4dfb2e34a0 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.11
+++ b/metadata/md5-cache/app-emulation/wine-1.7.11
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.11.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.10.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=4220c7ab14712d05b618b027dde080e5
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.12 b/metadata/md5-cache/app-emulation/wine-1.7.12
index 1c5619cc8a76..f507bad2bb31 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.12
+++ b/metadata/md5-cache/app-emulation/wine-1.7.12
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.12.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.12.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=e5a188cfa8366cea38617f1c286dd397
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.13 b/metadata/md5-cache/app-emulation/wine-1.7.13
index 2c1c9f20b789..50d59d647c3f 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.13
+++ b/metadata/md5-cache/app-emulation/wine-1.7.13
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.13.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.12.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=1056537e38c43eec788aaa5093450f50
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.14 b/metadata/md5-cache/app-emulation/wine-1.7.14
index 65e18deeb815..898c4bb24f82 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.14
+++ b/metadata/md5-cache/app-emulation/wine-1.7.14
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.14.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.12.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=a21490036c97eb5d3302053d7d33fbf6
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.15 b/metadata/md5-cache/app-emulation/wine-1.7.15
index 81c71b3dc6cb..35a197a9d4c1 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.15
+++ b/metadata/md5-cache/app-emulation/wine-1.7.15
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.15.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.12.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=fdcb8c3bbc3aedafa7f7df2952b448b0
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.16 b/metadata/md5-cache/app-emulation/wine-1.7.16
index 95a4ccebed0b..14298ebdc9e4 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.16
+++ b/metadata/md5-cache/app-emulation/wine-1.7.16
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.16.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.12.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=f0e66e109c66d18c8716f6cf61905fdf
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.17 b/metadata/md5-cache/app-emulation/wine-1.7.17
index 6687bd11f55b..8986531fd25e 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.17
+++ b/metadata/md5-cache/app-emulation/wine-1.7.17
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.17.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.12.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=9b4b00cf35b4bcb5b5f5a2c3b3ad9c7f
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.18 b/metadata/md5-cache/app-emulation/wine-1.7.18
index 22b886f161df..4dda3f1cbd8d 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.18
+++ b/metadata/md5-cache/app-emulation/wine-1.7.18
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.18.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.12.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=dd9b222eacc641f51b6c311dd5e7c551
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.19-r1 b/metadata/md5-cache/app-emulation/wine-1.7.19-r1
index 43c4d563a7f9..16934673d5a6 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.19-r1
+++ b/metadata/md5-cache/app-emulation/wine-1.7.19-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.19.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pipelight? ( https://github.com/compholio/wine-compholio-daily/archive/v1.7.18-1.tar.gz -> wine-compholio-daily-1.7.18-1.tar.gz ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.12.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=bee01b4747c3a92503c832b15c21890a
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.20 b/metadata/md5-cache/app-emulation/wine-1.7.20
index 4a7c890a7194..6787beb10bce 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.20
+++ b/metadata/md5-cache/app-emulation/wine-1.7.20
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.20.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pipelight? ( https://github.com/compholio/wine-compholio-daily/archive/v1.7.20.tar.gz -> wine-compholio-daily-1.7.20.tar.gz ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.20.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=6b6545968870172dafa284b044b8d77f
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.21 b/metadata/md5-cache/app-emulation/wine-1.7.21
index 3966a8a1ae4d..c05198fcd967 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.21
+++ b/metadata/md5-cache/app-emulation/wine-1.7.21
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.21.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pipelight? ( https://github.com/compholio/wine-compholio-daily/archive/v1.7.21.tar.gz -> wine-compholio-daily-1.7.21.tar.gz ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.21.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=3c2fa7d442f480cb960aadfb3d2fc9f3
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.22 b/metadata/md5-cache/app-emulation/wine-1.7.22
index e209c3d95371..74017099c060 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.22
+++ b/metadata/md5-cache/app-emulation/wine-1.7.22
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.22.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pipelight? ( https://github.com/compholio/wine-compholio-daily/archive/v1.7.22.tar.gz -> wine-compholio-1.7.22.tar.gz ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.21.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=7199f52cd137dc1c9db6a236ce947f5a
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.28 b/metadata/md5-cache/app-emulation/wine-1.7.28
index 0350745b2e25..267195b4106d 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.28
+++ b/metadata/md5-cache/app-emulation/wine-1.7.28
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.28.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pipelight? ( https://github.com/compholio/wine-compholio-daily/archive/v1.7.28.tar.gz -> wine-compholio-1.7.28.tar.gz ) pulseaudio? ( https://github.com/compholio/wine-compholio-daily/archive/v1.7.28.tar.gz -> wine-compholio-1.7.28.tar.gz ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.28-gstreamer-v4.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=499ef9c1dab6fce73facf25ad7a7a74f
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.29 b/metadata/md5-cache/app-emulation/wine-1.7.29
index 2400f344cd72..623b4c375e23 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.29
+++ b/metadata/md5-cache/app-emulation/wine-1.7.29
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.29.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pipelight? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.29.tar.gz -> wine-staging-1.7.29.tar.gz ) pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.29.tar.gz -> wine-staging-1.7.29.tar.gz ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.28-gstreamer-v4.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=ae74c62262b172fd821dbaef34c0e251
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.3 b/metadata/md5-cache/app-emulation/wine-1.7.3
index 808dfd94b799..3f24603bd8fb 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.3
+++ b/metadata/md5-cache/app-emulation/wine-1.7.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.3.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.3.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=d43a5dd688b440f0e7afcca5741db12f
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.33 b/metadata/md5-cache/app-emulation/wine-1.7.33
index ff451f73fe14..737cc66cecb9 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.33
+++ b/metadata/md5-cache/app-emulation/wine-1.7.33
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.33.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.34/wine_gecko-2.34-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.34/wine_gecko-2.34-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.4/wine-mono-4.5.4.msi ) pipelight? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.33.tar.gz -> wine-staging-1.7.33.tar.gz ) pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.33.tar.gz -> wine-staging-1.7.33.tar.gz ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.28-gstreamer-v4.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=b5edf420c87f1232fa09c371c4b7a445
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.38 b/metadata/md5-cache/app-emulation/wine-1.7.38
index 8b5add0249fe..f4e252173e58 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.38
+++ b/metadata/md5-cache/app-emulation/wine-1.7.38
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.38.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.6/wine-mono-4.5.6.msi ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.34-gstreamer-v5.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2015.03.07.tar.bz2 staging? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.38.tar.gz -> wine-staging-1.7.38.tar.gz ) pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.38.tar.gz -> wine-staging-1.7.38.tar.gz )
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=8d8b6563b033f9af767621d3a08b1917
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.39 b/metadata/md5-cache/app-emulation/wine-1.7.39
index 88a9fe1577b7..4666f959136e 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.39
+++ b/metadata/md5-cache/app-emulation/wine-1.7.39
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.39.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.6/wine-mono-4.5.6.msi ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.34-gstreamer-v5.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2015.03.07.tar.bz2 staging? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.39.tar.gz -> wine-staging-1.7.39.tar.gz ) pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.39.tar.gz -> wine-staging-1.7.39.tar.gz )
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=2f43a5313a7877ed46f0d5121a134be5
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.4 b/metadata/md5-cache/app-emulation/wine-1.7.4
index 157529fc14f9..07dfd1e3bb47 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.4
+++ b/metadata/md5-cache/app-emulation/wine-1.7.4
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.4.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/0.0.8/wine-mono-0.0.8.msi ) http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.4.tar.bz2 http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=5bf3cac8821221121062bd54ed7faffc
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.40 b/metadata/md5-cache/app-emulation/wine-1.7.40
index b2270f6f2273..77933ef2687f 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.40
+++ b/metadata/md5-cache/app-emulation/wine-1.7.40
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.40.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.6/wine-mono-4.5.6.msi ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.34-gstreamer-v5.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2015.03.07.tar.bz2 staging? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.40.tar.gz -> wine-staging-1.7.40.tar.gz ) pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.40.tar.gz -> wine-staging-1.7.40.tar.gz )
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=192948b262c7d26b1057230a250253d6
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.41 b/metadata/md5-cache/app-emulation/wine-1.7.41
index b00e2fd2892e..ad369e67a576 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.41
+++ b/metadata/md5-cache/app-emulation/wine-1.7.41
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.41.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.6/wine-mono-4.5.6.msi ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.34-gstreamer-v5.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2015.03.07.tar.bz2 staging? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.41.tar.gz -> wine-staging-1.7.41.tar.gz ) pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.41.tar.gz -> wine-staging-1.7.41.tar.gz )
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=1cf2d13afc61c5b7a88479305b1e6df3
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.42 b/metadata/md5-cache/app-emulation/wine-1.7.42
index 10266bffe3b4..643545e8cdf8 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.42
+++ b/metadata/md5-cache/app-emulation/wine-1.7.42
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.42.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.6/wine-mono-4.5.6.msi ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.34-gstreamer-v5.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2015.03.07.tar.bz2 staging? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.42.tar.gz -> wine-staging-1.7.42.tar.gz ) pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.42.tar.gz -> wine-staging-1.7.42.tar.gz )
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=e6120befc81d88c855526930bb45916c
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.43 b/metadata/md5-cache/app-emulation/wine-1.7.43
index 509d58f6e46b..86c451d93939 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.43
+++ b/metadata/md5-cache/app-emulation/wine-1.7.43
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.43.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.6/wine-mono-4.5.6.msi ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.34-gstreamer-v5.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2015.03.07.tar.bz2 staging? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.43.tar.gz -> wine-staging-1.7.43.tar.gz ) pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.43.tar.gz -> wine-staging-1.7.43.tar.gz )
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=db43b8e37e47742020608fbcafa78b29
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.44 b/metadata/md5-cache/app-emulation/wine-1.7.44
index 2d75c1b098db..e818cff0e99c 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.44
+++ b/metadata/md5-cache/app-emulation/wine-1.7.44
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.44.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.6/wine-mono-4.5.6.msi ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.34-gstreamer-v5.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2015.03.07.tar.bz2 staging? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.44.tar.gz -> wine-staging-1.7.44.tar.gz ) pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.44.tar.gz -> wine-staging-1.7.44.tar.gz )
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=35b48265a95026292b10bdbb7efb6470
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.45 b/metadata/md5-cache/app-emulation/wine-1.7.45
index 776d947c74da..707bc922783d 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.45
+++ b/metadata/md5-cache/app-emulation/wine-1.7.45
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.45.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.6/wine-mono-4.5.6.msi ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.34-gstreamer-v5.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2015.03.07.tar.bz2 staging? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.45.tar.gz -> wine-staging-1.7.45.tar.gz ) pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v1.7.45.tar.gz -> wine-staging-1.7.45.tar.gz )
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=1c587ced12535f3caaba026948fe0544
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.8 b/metadata/md5-cache/app-emulation/wine-1.7.8
index 722e7e94ac89..02b55056b76b 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.8
+++ b/metadata/md5-cache/app-emulation/wine-1.7.8
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.8.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.8.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=403c188fec3519cf882eec323ef139db
diff --git a/metadata/md5-cache/app-emulation/wine-1.7.9 b/metadata/md5-cache/app-emulation/wine-1.7.9
index 969e93bcfe6c..7798e4faae35 100644
--- a/metadata/md5-cache/app-emulation/wine-1.7.9
+++ b/metadata/md5-cache/app-emulation/wine-1.7.9
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/wine/Source/wine-1.7.9.tar.bz2 gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.24/wine_gecko-2.24-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.2/wine-mono-4.5.2.msi ) pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/wine/winepulse-patches-1.7.8.tar.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2013.06.24.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=39ad45244e805ad8fd13cc22f07e5b09
diff --git a/metadata/md5-cache/app-emulation/wine-9999 b/metadata/md5-cache/app-emulation/wine-9999
index bdd7a1e3ac80..77f0a5bc110b 100644
--- a/metadata/md5-cache/app-emulation/wine-9999
+++ b/metadata/md5-cache/app-emulation/wine-9999
@@ -10,5 +10,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) test? ( abi_x86_32 ) elibc_glibc? ( th
 RESTRICT=test
 SLOT=0
 SRC_URI=gecko? ( abi_x86_32? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86.msi ) abi_x86_64? ( mirror://sourceforge/wine/Wine%20Gecko/2.36/wine_gecko-2.36-x86_64.msi ) ) mono? ( mirror://sourceforge/wine/Wine%20Mono/4.5.6/wine-mono-4.5.6.msi ) gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/wine/wine-1.7.34-gstreamer-v5.patch.bz2 ) http://dev.gentoo.org/~tetromino/distfiles/wine/wine-gentoo-2015.03.07.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=7436110e4648633eeb8f97f591eea9f5
diff --git a/metadata/md5-cache/app-i18n/enca-1.14-r1 b/metadata/md5-cache/app-i18n/enca-1.14-r1
index a0e7d0d9e243..b1aadabb3ceb 100644
--- a/metadata/md5-cache/app-i18n/enca-1.14-r1
+++ b/metadata/md5-cache/app-i18n/enca-1.14-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=recode? ( >=app-text/recode-3.6_p15 ) sys-devel/gettext
 SLOT=0
 SRC_URI=http://dl.cihar.com/enca/enca-1.14.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=9076a38c0988a8e4b8cf75acf0e5919c
diff --git a/metadata/md5-cache/app-i18n/enca-1.14-r2 b/metadata/md5-cache/app-i18n/enca-1.14-r2
index 911892d8b3be..17f21d8de3bf 100644
--- a/metadata/md5-cache/app-i18n/enca-1.14-r2
+++ b/metadata/md5-cache/app-i18n/enca-1.14-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=recode? ( >=app-text/recode-3.6_p15 )
 SLOT=0
 SRC_URI=http://dl.cihar.com/enca/enca-1.14.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7744c0d009c80d11275160afd209b960
diff --git a/metadata/md5-cache/app-i18n/ibus-1.5.10 b/metadata/md5-cache/app-i18n/ibus-1.5.10
index 5031ee9795ab..7ad5d55d53b2 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.10
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.10
@@ -4,7 +4,7 @@ DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
 EAPI=5
 HOMEPAGE=http://code.google.com/p/ibus/
 IUSE=deprecated gconf gtk +gtk3 +introspection nls +python test vala wayland +X python_targets_python2_7 test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.26:2 gnome-base/librsvg:2 sys-apps/dbus[X?] app-text/iso-codes >=gnome-base/dconf-0.13.4 x11-libs/libnotify gconf? ( >=gnome-base/gconf-2.12:2 ) gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) 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(+)] ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) nls? ( virtual/libintl ) wayland? ( dev-libs/wayland ) x11-apps/setxkbmap python? ( dev-python/pyxdg deprecated? ( >=dev-python/dbus-python-0.83 dev-python/pygobject:2 dev-python/pygtk:2 ) gtk3? ( dev-python/pygobject:3 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] x11-libs/gtk+:3[introspection] ) )
 REQUIRED_USE=|| ( gtk gtk3 X ) deprecated? ( python ) vala? ( introspection ) python? ( python_targets_python2_7 || ( deprecated ( gtk3 introspection ) ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.10/ibus-1.5.10.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f810ff210f7797ef8c61eb142246b987
+_md5_=72ff1cc1ab828c3308a6d0c94084c46b
diff --git a/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.0 b/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.0
index 24407fc431d6..8d8214d828b5 100644
--- a/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.0
+++ b/metadata/md5-cache/app-i18n/kcm-fcitx-0.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=app-i18n/fcitx-4.2.8 app-i18n/fcitx-qt5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/extra-cmake-modules-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kitemviews-5.10.0:5 >=kde-frameworks/knewstuff-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 sys-devel/gettext x11-libs/libxkbfile virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=app-i18n/fcitx-4.2.8 app-i18n/fcitx-qt5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/extra-cmake-modules-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kitemviews-5.11.0:5 >=kde-frameworks/knewstuff-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 sys-devel/gettext x11-libs/libxkbfile virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE configuration module for Fcitx
 EAPI=5
 HOMEPAGE=http://fcitx-im.org/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=app-i18n/fcitx-4.2.8 app-i18n/fcitx-qt5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/extra-cmake-modules-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kitemviews-5.10.0:5 >=kde-frameworks/knewstuff-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 sys-devel/gettext x11-libs/libxkbfile >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=app-i18n/fcitx-4.2.8 app-i18n/fcitx-qt5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/extra-cmake-modules-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kitemviews-5.11.0:5 >=kde-frameworks/knewstuff-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 sys-devel/gettext x11-libs/libxkbfile >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=http://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-0.5.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=e5e2c9e530f059e3939196afb45eda43
diff --git a/metadata/md5-cache/app-i18n/x-unikey-1.0.4-r1 b/metadata/md5-cache/app-i18n/x-unikey-1.0.4-r1
deleted file mode 100644
index 2a84ce256b21..000000000000
--- a/metadata/md5-cache/app-i18n/x-unikey-1.0.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup unpack
-DEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE gtk? ( >=x11-libs/gtk+-2.2:2 ) nls? ( virtual/libintl ) dev-libs/glib virtual/pkgconfig nls? ( sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=Vietnamese X Input Method
-EAPI=1
-HOMEPAGE=http://www.unikey.org/
-IUSE=nls gtk
-KEYWORDS=~amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE gtk? ( >=x11-libs/gtk+-2.2:2 ) nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://sourceforge/unikey/x-unikey-1.0.4.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=c1588684db56316c0b06dcdbeacd9bc5
diff --git a/metadata/md5-cache/app-i18n/x-unikey-1.0.4-r2 b/metadata/md5-cache/app-i18n/x-unikey-1.0.4-r2
index 22ea60d83769..e42396735c15 100644
--- a/metadata/md5-cache/app-i18n/x-unikey-1.0.4-r2
+++ b/metadata/md5-cache/app-i18n/x-unikey-1.0.4-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Vietnamese X Input Method
 EAPI=5
 HOMEPAGE=http://www.unikey.org/
 IUSE=nls gtk
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=x11-libs/libX11 x11-libs/libSM x11-libs/libICE gtk? ( >=x11-libs/gtk+-2.2:2 ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/unikey/x-unikey-1.0.4.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=43e80cdcb2f7c881aa7daf81a198f857
+_md5_=12bbd2fb1aa563da7e54d98155f9ba58
diff --git a/metadata/md5-cache/app-misc/datovka-3.0.3-r1 b/metadata/md5-cache/app-misc/datovka-3.0.3-r1
index 43d701357673..1cf71f8a812e 100644
--- a/metadata/md5-cache/app-misc/datovka-3.0.3-r1
+++ b/metadata/md5-cache/app-misc/datovka-3.0.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=GUI to access Czech eGov "Datove schranky"
 EAPI=5
 HOMEPAGE=http://labs.nic.cz/page/969/datovka/
 IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/reportlab[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/dejavu >=net-libs/dslib-3.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://www.nic.cz/public_media/datove_schranky/releases/src/datovka-3.0.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=0161940cf35832657ded7bd251709397
+_md5_=2ff30e9470f9d79c8b302edac10e237b
diff --git a/metadata/md5-cache/app-misc/freemind-0.9.0-r1 b/metadata/md5-cache/app-misc/freemind-0.9.0-r1
deleted file mode 100644
index 47666f62b99e..000000000000
--- a/metadata/md5-cache/app-misc/freemind-0.9.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-lang/python >=virtual/jdk-1.4 pdf? ( dev-java/avalon-framework:4.2 ) svg? ( dev-java/avalon-framework:4.2 ) dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) svg? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Mind-mapping software written in Java
-EAPI=4
-HOMEPAGE=http://freemind.sourceforge.net
-IUSE=groovy latex pdf svg elibc_FreeBSD doc elibc_FreeBSD
-KEYWORDS=amd64 ppc x86 ~x64-macos
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.4 dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) svg? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=mirror://sourceforge/freemind/freemind-src-0.9.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b440744e578b14df818d7b19ebd05992
diff --git a/metadata/md5-cache/app-misc/freemind-1.0.0-r1 b/metadata/md5-cache/app-misc/freemind-1.0.0-r1
deleted file mode 100644
index c3ae68e6f724..000000000000
--- a/metadata/md5-cache/app-misc/freemind-1.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 dev-java/jortho:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) svg? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) >=virtual/jdk-1.4 pdf? ( dev-java/avalon-framework:4.2 ) svg? ( dev-java/avalon-framework:4.2 ) >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Mind-mapping software written in Java
-EAPI=5
-HOMEPAGE=http://freemind.sourceforge.net
-IUSE=groovy latex pdf svg elibc_FreeBSD doc elibc_FreeBSD
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 dev-java/jortho:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) svg? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=mirror://sourceforge/freemind/freemind-src-1.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1f57e56c42154fac61feeaff7e31fd58
diff --git a/metadata/md5-cache/app-misc/freemind-1.0.1 b/metadata/md5-cache/app-misc/freemind-1.0.1-r1
similarity index 68%
rename from metadata/md5-cache/app-misc/freemind-1.0.1
rename to metadata/md5-cache/app-misc/freemind-1.0.1-r1
index 4ce0101eaa43..9098fdf14b93 100644
--- a/metadata/md5-cache/app-misc/freemind-1.0.1
+++ b/metadata/md5-cache/app-misc/freemind-1.0.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 dev-java/jortho:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) svg? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) >=virtual/jdk-1.4 pdf? ( dev-java/avalon-framework:4.2 ) svg? ( dev-java/avalon-framework:4.2 ) >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 dev-java/jortho:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.8 dev-java/fop:2 ) svg? ( dev-java/batik:1.8 dev-java/fop:2 ) >=virtual/jdk-1.6 pdf? ( dev-java/avalon-framework:4.2 ) svg? ( dev-java/avalon-framework:4.2 ) >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=Mind-mapping software written in Java
 EAPI=5
 HOMEPAGE=http://freemind.sourceforge.net
 IUSE=groovy latex pdf svg elibc_FreeBSD doc elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 dev-java/jortho:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) svg? ( dev-java/batik:1.7 >=dev-java/fop-0.95:0 ) >=virtual/jre-1.4 >=dev-java/java-config-2.2.0
+RDEPEND=dev-java/javahelp:0 dev-java/jgoodies-forms:0 dev-java/jibx:0 dev-java/jortho:0 >=dev-java/simplyhtml-0.13.1:0 groovy? ( dev-java/groovy ) latex? ( dev-java/hoteqn:0 ) pdf? ( dev-java/batik:1.8 dev-java/fop:2 ) svg? ( dev-java/batik:1.8 dev-java/fop:2 ) >=virtual/jre-1.6 >=dev-java/java-config-2.2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/freemind/freemind-src-1.0.1.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=8e72896ab34f170e889d38395ee6b80f
+_md5_=750053a974e25d0043fe7f822920bf74
diff --git a/metadata/md5-cache/app-misc/gnuit-4.9.5-r2 b/metadata/md5-cache/app-misc/gnuit-4.9.5-r2
index d694137abd1e..b8d59513e91b 100644
--- a/metadata/md5-cache/app-misc/gnuit-4.9.5-r2
+++ b/metadata/md5-cache/app-misc/gnuit-4.9.5-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=configure install postinst prepare
 DESCRIPTION=GNU Interactive Tools - increase speed and efficiency of most daily tasks
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/gnuit/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc x86
 LICENSE=GPL-3 FDL-1.3
 SLOT=0
 SRC_URI=mirror://gnu/gnuit/gnuit-4.9.5.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=17f867ddc1c5cff544bc2c582e12142b
+_md5_=c1e1ce650949b9d0744b749eb67eefb7
diff --git a/metadata/md5-cache/app-misc/ranger-1.6.1 b/metadata/md5-cache/app-misc/ranger-1.6.1
deleted file mode 100644
index f79fa118106d..000000000000
--- a/metadata/md5-cache/app-misc/ranger-1.6.1
+++ /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[ncurses] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) >=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 vim-inspired file manager for the console
-EAPI=5
-HOMEPAGE=http://ranger.nongnu.org/
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=virtual/pager python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) >=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://nongnu.org/ranger/ranger-1.6.1.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=04a6cab6e4da1e9afbd8f296f97ff4f4
diff --git a/metadata/md5-cache/app-misc/ranger-1.7.0 b/metadata/md5-cache/app-misc/ranger-1.7.0
deleted file mode 100644
index 58af0cd5c49c..000000000000
--- a/metadata/md5-cache/app-misc/ranger-1.7.0
+++ /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[ncurses] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) >=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 vim-inspired file manager for the console
-EAPI=5
-HOMEPAGE=http://ranger.nongnu.org/
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=virtual/pager python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) >=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://nongnu.org/ranger/ranger-1.7.0.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=f096272de63d11d8132fcef4b6771487
diff --git a/metadata/md5-cache/app-misc/ranger-1.7.1 b/metadata/md5-cache/app-misc/ranger-1.7.1
index f959784b4380..b0fb619fe2dc 100644
--- a/metadata/md5-cache/app-misc/ranger-1.7.1
+++ b/metadata/md5-cache/app-misc/ranger-1.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=A vim-inspired file manager for the console
 EAPI=5
 HOMEPAGE=http://ranger.nongnu.org/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-3
 RDEPEND=virtual/pager python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) >=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://nongnu.org/ranger/ranger-1.7.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=d86c8086e32ae758aaffc81d9af2ed48
+_md5_=497fa5267d5cc783b6252634f43bd87b
diff --git a/metadata/md5-cache/app-misc/tmux-1.9a b/metadata/md5-cache/app-misc/tmux-1.9a
index b3b5645a18d7..47a182110934 100644
--- a/metadata/md5-cache/app-misc/tmux-1.9a
+++ b/metadata/md5-cache/app-misc/tmux-1.9a
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=>=dev-libs/libevent-2.0.10 sys-libs/ncurses virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Terminal multiplexer
 EAPI=5
-HOMEPAGE=http://tmux.sourceforge.net
+HOMEPAGE=http://tmux.github.io/
 IUSE=debug selinux vim-syntax
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=ISC
 RDEPEND=>=dev-libs/libevent-2.0.10 sys-libs/ncurses selinux? ( sec-policy/selinux-screen ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
-SRC_URI=mirror://sourceforge/tmux/tmux-1.9a.tar.gz
+SRC_URI=https://github.com/tmux/tmux/releases/download/1.9a/tmux-1.9a.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=6c54b8799d3aa0156c24a94d0592a846
+_md5_=89447cef45a4430c23c8679c96194f88
diff --git a/metadata/md5-cache/app-misc/tmux-2.0 b/metadata/md5-cache/app-misc/tmux-2.0
index e9113c457287..a8ec689aa468 100644
--- a/metadata/md5-cache/app-misc/tmux-2.0
+++ b/metadata/md5-cache/app-misc/tmux-2.0
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=>=dev-libs/libevent-2.0.10 sys-libs/ncurses virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Terminal multiplexer
 EAPI=5
-HOMEPAGE=http://tmux.sourceforge.net
+HOMEPAGE=http://tmux.github.io/
 IUSE=debug selinux vim-syntax
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=ISC
 RDEPEND=>=dev-libs/libevent-2.0.10 sys-libs/ncurses selinux? ( sec-policy/selinux-screen ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
-SRC_URI=mirror://sourceforge/tmux/tmux-2.0.tar.gz
+SRC_URI=https://github.com/tmux/tmux/releases/download/2.0/tmux-2.0.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=5e7e092fba8b2cc9b064dc0c05c82865
+_md5_=e8052f53329db25b5116d74954499d07
diff --git a/metadata/md5-cache/app-misc/tmux-9999 b/metadata/md5-cache/app-misc/tmux-9999
index 7b69e6cdc57c..488d7b6a178c 100644
--- a/metadata/md5-cache/app-misc/tmux-9999
+++ b/metadata/md5-cache/app-misc/tmux-9999
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=>=dev-libs/libevent-2.0.10 sys-libs/ncurses virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Terminal multiplexer
 EAPI=5
-HOMEPAGE=http://tmux.sourceforge.net
+HOMEPAGE=http://tmux.github.io/
 IUSE=debug selinux vim-syntax
 LICENSE=ISC
 RDEPEND=>=dev-libs/libevent-2.0.10 sys-libs/ncurses selinux? ( sec-policy/selinux-screen ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 SLOT=0
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=109701f0d671c7686ede02c06ed31ad8
+_md5_=df24b07f484c5ba4831ea5bb2fafe090
diff --git a/metadata/md5-cache/app-mobilephone/obexftp-0.23-r2 b/metadata/md5-cache/app-mobilephone/obexftp-0.23-r2
index f789fa10988f..d27bda1e39da 100644
--- a/metadata/md5-cache/app-mobilephone/obexftp-0.23-r2
+++ b/metadata/md5-cache/app-mobilephone/obexftp-0.23-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=dev-libs/openobex bluetooth? ( net-wireless/bluez ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby:1.9 ) tcl? ( dev-lang/tcl:0= ) virtual/pkgconfig 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(-)] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=dev-libs/openobex bluetooth? ( net-wireless/bluez ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:1.9 ) tcl? ( dev-lang/tcl:0= ) virtual/pkgconfig 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(-)] !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=File transfer over OBEX for mobile phones
 EAPI=5
 HOMEPAGE=http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp
 IUSE=bluetooth debug perl python ruby tcl python_targets_python2_7
 KEYWORDS=amd64 hppa ppc ~sparc x86
 LICENSE=GPL-2
-RDEPEND=dev-libs/openobex bluetooth? ( net-wireless/bluez ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby:1.9 ) tcl? ( dev-lang/tcl:0= ) 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(-)]
+RDEPEND=dev-libs/openobex bluetooth? ( net-wireless/bluez ) perl? ( dev-lang/perl:= ) ruby? ( dev-lang/ruby:1.9 ) tcl? ( dev-lang/tcl:0= ) 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://sourceforge/openobex/obexftp-0.23.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=cf4301a359f33688214d8d5cfa3c4df6
+_md5_=cfddc54c50ca36dd73d63a7bd4cff0a7
diff --git a/metadata/md5-cache/app-mobilephone/obexftp-0.24 b/metadata/md5-cache/app-mobilephone/obexftp-0.24
index fa74daf0c341..6e719fc22716 100644
--- a/metadata/md5-cache/app-mobilephone/obexftp-0.24
+++ b/metadata/md5-cache/app-mobilephone/obexftp-0.24
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/openobex-1.7 bluetooth? ( net-wireless/bluez ) 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:2.0 dev-lang/ruby:1.9 ) ) tcl? ( dev-lang/tcl:0= ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEPEND=>=dev-libs/openobex-1.7 bluetooth? ( net-wireless/bluez ) 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:2.0 dev-lang/ruby:1.9 ) ) tcl? ( dev-lang/tcl:0= ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=File transfer over OBEX for mobile phones
 EAPI=5
 HOMEPAGE=http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp
 IUSE=bluetooth perl python ruby tcl 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 ~hppa ~ppc ~sparc ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-libs/openobex-1.7 bluetooth? ( net-wireless/bluez ) 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:2.0 dev-lang/ruby:1.9 ) ) tcl? ( dev-lang/tcl:0= )
+RDEPEND=>=dev-libs/openobex-1.7 bluetooth? ( net-wireless/bluez ) 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:2.0 dev-lang/ruby:1.9 ) ) tcl? ( dev-lang/tcl:0= )
 SLOT=0
 SRC_URI=mirror://sourceforge/openobex/obexftp-0.24-Source.tar.gz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=0c1375e763c9c912714941168ab5bb37
+_md5_=32a861ee0d0f692bd306394c44535837
diff --git a/metadata/md5-cache/app-office/akonadi-server-1.13.0 b/metadata/md5-cache/app-office/akonadi-server-1.13.0
index 407f7df8afc7..cad525c3b033 100644
--- a/metadata/md5-cache/app-office/akonadi-server-1.13.0
+++ b/metadata/md5-cache/app-office/akonadi-server-1.13.0
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kde/stable/akonadi/src/akonadi-1.13.0.tar.bz2
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=e3e91da6578dfb5bd3f536e8fc35398a
+_md5_=9df4e2107b240c08aaf759212b5e2c7d
diff --git a/metadata/md5-cache/app-office/akonadi-server-1.13.0-r1 b/metadata/md5-cache/app-office/akonadi-server-1.13.0-r1
new file mode 100644
index 000000000000..423835cf2caf
--- /dev/null
+++ b/metadata/md5-cache/app-office/akonadi-server-1.13.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=dev-libs/boost:= x11-misc/shared-mime-info qt4? ( >=dev-qt/qtcore-4.8.5:4 >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[mysql?,postgres?] >=dev-qt/qttest-4.8.5:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[mysql?,postgres?] dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 soprano? ( dev-libs/soprano[-qt4,qt5] ) ) soprano? ( dev-libs/soprano ) sqlite? ( dev-db/sqlite:3 ) dev-libs/libxslt >=dev-util/automoc-0.9.88 test? ( sys-apps/dbus ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=The server part of Akonadi
+EAPI=5
+HOMEPAGE=http://pim.kde.org/akonadi
+IUSE=+mysql postgres +qt4 qt5 soprano sqlite test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/boost:= x11-misc/shared-mime-info qt4? ( >=dev-qt/qtcore-4.8.5:4 >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[mysql?,postgres?] >=dev-qt/qttest-4.8.5:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[mysql?,postgres?] dev-qt/qttest:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 soprano? ( dev-libs/soprano[-qt4,qt5] ) ) soprano? ( dev-libs/soprano ) sqlite? ( dev-db/sqlite:3 ) postgres? ( dev-db/postgresql[server] )
+REQUIRED_USE=^^ ( qt4 qt5 ) || ( sqlite mysql postgres )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://kde/stable/akonadi/src/akonadi-1.13.0.tar.bz2
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=9694075e25b5b99c4186213abaaedcb1
diff --git a/metadata/md5-cache/app-office/skrooge-2.0.0 b/metadata/md5-cache/app-office/skrooge-2.0.0
new file mode 100644
index 000000000000..56b1aa842351
--- /dev/null
+++ b/metadata/md5-cache/app-office/skrooge-2.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/kdesignerplugin-5.11.0:5 >=kde-frameworks/kguiaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kitemviews-5.11.0:5 >=kde-frameworks/kjobwidgets-5.11.0:5 >=kde-frameworks/knewstuff-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/knotifyconfig-5.11.0:5 >=kde-frameworks/kparts-5.11.0:5 >=kde-frameworks/krunner-5.11.0:5 >=kde-frameworks/kwallet-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 app-crypt/qca:2[qt5] dev-db/sqlite:3 dev-libs/grantlee:5 dev-libs/libxslt dev-libs/qjson dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-misc/shared-mime-info activities? ( >=kde-frameworks/kactivities-5.11.0:5 ) ofx? ( >=dev-libs/libofx-0.9.1 ) !app-office/skrooge:4 dev-libs/boost >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 handbook? ( >=kde-frameworks/kdoctools-5.11.0:5 ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Personal finances manager, aiming at being simple and intuitive
+EAPI=5
+HOMEPAGE=http://www.skrooge.org/
+IUSE=activities ofx test debug +handbook test
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/kdesignerplugin-5.11.0:5 >=kde-frameworks/kguiaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kitemviews-5.11.0:5 >=kde-frameworks/kjobwidgets-5.11.0:5 >=kde-frameworks/knewstuff-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/knotifyconfig-5.11.0:5 >=kde-frameworks/kparts-5.11.0:5 >=kde-frameworks/krunner-5.11.0:5 >=kde-frameworks/kwallet-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 app-crypt/qca:2[qt5] dev-db/sqlite:3 dev-libs/grantlee:5 dev-libs/libxslt dev-libs/qjson dev-qt/designer:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 x11-misc/shared-mime-info activities? ( >=kde-frameworks/kactivities-5.11.0:5 ) ofx? ( >=dev-libs/libofx-0.9.1 ) !app-office/skrooge:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/skrooge/skrooge-2.0.0.tar.xz
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=c0c7a0cd3273587715bd7ec9e85d45db
diff --git a/metadata/md5-cache/app-shells/bash-completion-2.1_p20141224 b/metadata/md5-cache/app-shells/bash-completion-2.1_p20141224
index 46eb15734541..bc22f7a4e791 100644
--- a/metadata/md5-cache/app-shells/bash-completion-2.1_p20141224
+++ b/metadata/md5-cache/app-shells/bash-completion-2.1_p20141224
@@ -3,11 +3,11 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Programmable Completion for bash
 EAPI=5
 HOMEPAGE=http://bash-completion.alioth.debian.org/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-2
 PDEPEND=>=app-shells/gentoo-bashcomp-20140911
 RDEPEND=>=app-shells/bash-4.3_p30-r1 sys-apps/miscfiles !app-eselect/eselect-bashcomp
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~mgorny/dist/bash-completion-2.1_p20141224.tar.xz http://dev.gentoo.org/~mgorny/dist/bashcomp-2.0.1.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fbae65f4bdb55206cb00245d87aa1466
+_md5_=f5a578fbf84ab24968656272ebc7ddbf
diff --git a/metadata/md5-cache/app-shells/gentoo-bashcomp-20140911 b/metadata/md5-cache/app-shells/gentoo-bashcomp-20140911
index 07967da960b1..c07a03c1bed0 100644
--- a/metadata/md5-cache/app-shells/gentoo-bashcomp-20140911
+++ b/metadata/md5-cache/app-shells/gentoo-bashcomp-20140911
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DESCRIPTION=Gentoo-specific bash command-line completions (emerge, ebuild, equery, repoman, layman, etc)
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~mgorny/dist/gentoo-bashcomp-20140911.tar.bz2
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=5d3b879e4fc3ffd3ad1863cdb33bce6f
+_md5_=95c7768d446fad715de5c2099a7b8236
diff --git a/metadata/md5-cache/app-text/libpaper-1.1.24-r2 b/metadata/md5-cache/app-text/libpaper-1.1.24-r2
index 7ae4c91dad70..051eedfbe99e 100644
--- a/metadata/md5-cache/app-text/libpaper-1.1.24-r2
+++ b/metadata/md5-cache/app-text/libpaper-1.1.24-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r10 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://debian/pool/main/libp/libpaper/libpaper_1.1.24.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7f0e3ee5c5158430e50086fbef31419c
diff --git a/metadata/md5-cache/app-text/mupdf-1.5-r1 b/metadata/md5-cache/app-text/mupdf-1.5-r1
index fa8e92187c6f..b5bae6862798 100644
--- a/metadata/md5-cache/app-text/mupdf-1.5-r1
+++ b/metadata/md5-cache/app-text/mupdf-1.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=a lightweight PDF viewer and toolkit written in portable C
 EAPI=5
 HOMEPAGE=http://mupdf.com/
 IUSE=X vanilla +curl +openssl static static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=AGPL-3
 RDEPEND=dev-libs/openssl[static-libs?] media-libs/freetype:2[static-libs?] media-libs/jbig2dec[static-libs?] media-libs/openjpeg:2[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] )
 SLOT=0/1.5
 SRC_URI=http://git.ghostscript.com/?p=mupdf.git;a=snapshot;h=b2f096de23e5341fbbcd7c290f3a144423741906;sf=tgz -> mupdf-1.5.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
-_md5_=77b7b330b65786a719f6b2d8694adb59
+_md5_=422a2f8c4ec291e4cb7c86b7d93f7203
diff --git a/metadata/md5-cache/app-text/recode-3.6_p20-r1 b/metadata/md5-cache/app-text/recode-3.6_p20-r1
index 0f934490a08c..efd5d6bc642b 100644
--- a/metadata/md5-cache/app-text/recode-3.6_p20-r1
+++ b/metadata/md5-cache/app-text/recode-3.6_p20-r1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/recode/recode-3.6.tar.gz mirror://debian/pool/main/r/recode/recode_3.6-20.debian.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e22913a18c5cb62e5f57ab88e3af0923
diff --git a/metadata/md5-cache/dev-cpp/atkmm-2.22.7-r1 b/metadata/md5-cache/dev-cpp/atkmm-2.22.7-r1
index b28250d6ea64..e6a625f9a7f3 100644
--- a/metadata/md5-cache/dev-cpp/atkmm-2.22.7-r1
+++ b/metadata/md5-cache/dev-cpp/atkmm-2.22.7-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-cpp/glibmm-2.36.0:2[doc?,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(-)?] >=dev-libs/atk-2.8.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(-)?] >=dev-libs/libsigc++-2.3.2:2[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(-)?] !<dev-cpp/gtkmm-2.22.0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtkmmlibs-20140508 !app-emulation/emul-linux-x86-gtkmmlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/atkmm/2.22/atkmm-2.22.7.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=233adb704a53ec0ea209c4264c53a9d4
diff --git a/metadata/md5-cache/dev-cpp/cairomm-1.10.0-r1 b/metadata/md5-cache/dev-cpp/cairomm-1.10.0-r1
index 9aa51695be24..7a2f3b0a14c6 100644
--- a/metadata/md5-cache/dev-cpp/cairomm-1.10.0-r1
+++ b/metadata/md5-cache/dev-cpp/cairomm-1.10.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=x11-libs/cairo-1.12.10[svg?,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(-)?] >=dev-libs/libsigc++-2.3.2:2[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-gtkmmlibs-20140508 !app-emulation/emul-linux-x86-gtkmmlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://cairographics.org/releases/cairomm-1.10.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bef4cef8fb058229bb5ba3b9ba221cb3
diff --git a/metadata/md5-cache/dev-cpp/gflags-2.1.1-r1 b/metadata/md5-cache/dev-cpp/gflags-2.1.1-r1
index c52ae6bad46d..f5aa1413f793 100644
--- a/metadata/md5-cache/dev-cpp/gflags-2.1.1-r1
+++ b/metadata/md5-cache/dev-cpp/gflags-2.1.1-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x8
 LICENSE=BSD
 SLOT=0
 SRC_URI=https://github.com/schuhschuh/gflags/archive/v2.1.1.tar.gz -> gflags-2.1.1.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=45283345f2ba6e975be96977bafa5e4e
diff --git a/metadata/md5-cache/dev-cpp/gflags-9999 b/metadata/md5-cache/dev-cpp/gflags-9999
index c77b89171af8..ce03fd4ade9b 100644
--- a/metadata/md5-cache/dev-cpp/gflags-9999
+++ b/metadata/md5-cache/dev-cpp/gflags-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://code.google.com/p/gflags/
 IUSE=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
 LICENSE=BSD
 SLOT=0
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=04ce85d98a6587839e4c2d11cce30314
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.42.0-r1 b/metadata/md5-cache/dev-cpp/glibmm-2.42.0-r1
index 4f79d4eeb4d4..3b4cf1f1bb4c 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.42.0-r1
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.42.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/libsigc++-2.3.2:2[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(-)?] >=dev-libs/glib-2.42:2[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-gtkmmlibs-20140508 !app-emulation/emul-linux-x86-gtkmmlibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glibmm/2.42/glibmm-2.42.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7f61ecf1e172eba86ea345c832f89934
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.44.0 b/metadata/md5-cache/dev-cpp/glibmm-2.44.0
index 2c7d8a7bcee1..fec1a9c11ca1 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.44.0
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.44.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ GPL-2+
 RDEPEND=>=dev-libs/libsigc++-2.3.2:2[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(-)?] >=dev-libs/glib-2.44:2[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-gtkmmlibs-20140508 !app-emulation/emul-linux-x86-gtkmmlibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glibmm/2.44/glibmm-2.44.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2e8e1aadf9872fc358796e89caf8bbe6
diff --git a/metadata/md5-cache/dev-cpp/glog-0.3.3-r1 b/metadata/md5-cache/dev-cpp/glog-0.3.3-r1
index 0f361a1ac389..2db4fda470a4 100644
--- a/metadata/md5-cache/dev-cpp/glog-0.3.3-r1
+++ b/metadata/md5-cache/dev-cpp/glog-0.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=gflags? ( >=dev-cpp/gflags-2.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(-)?] ) unwind? ( sys-libs/libunwind )
 SLOT=0
 SRC_URI=http://google-glog.googlecode.com/files/glog-0.3.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=fd89a4801cdde80f05b2ea9c78c236e5
diff --git a/metadata/md5-cache/dev-cpp/gmock-1.7.0-r1 b/metadata/md5-cache/dev-cpp/gmock-1.7.0-r1
index dbb8a3b89160..1d6b899ab07a 100644
--- a/metadata/md5-cache/dev-cpp/gmock-1.7.0-r1
+++ b/metadata/md5-cache/dev-cpp/gmock-1.7.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==dev-cpp/gtest-1.7.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(-)?]
 SLOT=0
 SRC_URI=http://googlemock.googlecode.com/files/gmock-1.7.0.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=22658f0ef859fac1bf41028662d272fc
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.6.0-r2 b/metadata/md5-cache/dev-cpp/gtest-1.6.0-r2
index 19740b257647..cd9970d8ee5d 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.6.0-r2
+++ b/metadata/md5-cache/dev-cpp/gtest-1.6.0-r2
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://googletest.googlecode.com/files/gtest-1.6.0.zip
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=821eec92813d4c3b7207548c1ab49ff4
diff --git a/metadata/md5-cache/dev-cpp/gtest-1.7.0 b/metadata/md5-cache/dev-cpp/gtest-1.7.0
index 8d2169e82b3d..f966409c9fa2 100644
--- a/metadata/md5-cache/dev-cpp/gtest-1.7.0
+++ b/metadata/md5-cache/dev-cpp/gtest-1.7.0
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~am
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://googletest.googlecode.com/files/gtest-1.7.0.zip
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=53158dda8eb0df4db74af8a6816f6aeb
diff --git a/metadata/md5-cache/dev-cpp/gtkmm-2.24.4-r1 b/metadata/md5-cache/dev-cpp/gtkmm-2.24.4-r1
index 3b63d201050a..0ab5e5215128 100644
--- a/metadata/md5-cache/dev-cpp/gtkmm-2.24.4-r1
+++ b/metadata/md5-cache/dev-cpp/gtkmm-2.24.4-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-cpp/glibmm-2.34.1:2[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(-)?] >=x11-libs/gtk+-2.24.15:2[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(-)?] >=x11-libs/gdk-pixbuf-2.28:2[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(-)?] >=dev-cpp/atkmm-2.22.7[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(-)?] >=dev-cpp/cairomm-1.10.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(-)?] >=dev-cpp/pangomm-2.34.0:1.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(-)?] >=dev-libs/libsigc++-2.3.2:2[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-gtkmmlibs-20140508 !app-emulation/emul-linux-x86-gtkmmlibs[-abi_x86_32(-)] )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/gtkmm/2.24/gtkmm-2.24.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dc9ea0b36200bc781c593340c11583f9
diff --git a/metadata/md5-cache/dev-cpp/gtkmm-3.14.0-r1 b/metadata/md5-cache/dev-cpp/gtkmm-3.14.0-r1
index 332bcf2bbf27..249c35a419e6 100644
--- a/metadata/md5-cache/dev-cpp/gtkmm-3.14.0-r1
+++ b/metadata/md5-cache/dev-cpp/gtkmm-3.14.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-cpp/glibmm-2.41.2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 REQUIRED_USE=|| ( aqua wayland X )
 SLOT=3.0
 SRC_URI=mirror://gnome/sources/gtkmm/3.14/gtkmm-3.14.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6b0215e9324881381f2cadf22b7fb18f
diff --git a/metadata/md5-cache/dev-cpp/gtkmm-3.16.0 b/metadata/md5-cache/dev-cpp/gtkmm-3.16.0
index e94b43bfc751..0550bcfeb038 100644
--- a/metadata/md5-cache/dev-cpp/gtkmm-3.16.0
+++ b/metadata/md5-cache/dev-cpp/gtkmm-3.16.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-cpp/glibmm-2.44.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 REQUIRED_USE=|| ( aqua wayland X )
 SLOT=3.0
 SRC_URI=mirror://gnome/sources/gtkmm/3.16/gtkmm-3.16.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d2eb224da3302c46583a5b44ba864adf
diff --git a/metadata/md5-cache/dev-cpp/libglademm-2.6.7-r1 b/metadata/md5-cache/dev-cpp/libglademm-2.6.7-r1
index 6948c4172424..f0f64e5f1fd6 100644
--- a/metadata/md5-cache/dev-cpp/libglademm-2.6.7-r1
+++ b/metadata/md5-cache/dev-cpp/libglademm-2.6.7-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=gnome-base/libglade-2.6.4-r1:2.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(-)?] >=dev-cpp/gtkmm-2.24.3:2.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(-)?] >=dev-cpp/glibmm-2.34.1:2[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-gtkmmlibs-20140508 !app-emulation/emul-linux-x86-gtkmmlibs[-abi_x86_32(-)] )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libglademm/2.6/libglademm-2.6.7.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=463d33bd60b0defa4503ef913ab2fe1d
diff --git a/metadata/md5-cache/dev-cpp/libxmlpp-2.36.0-r1 b/metadata/md5-cache/dev-cpp/libxmlpp-2.36.0-r1
index 405685462e98..1afecebc9888 100644
--- a/metadata/md5-cache/dev-cpp/libxmlpp-2.36.0-r1
+++ b/metadata/md5-cache/dev-cpp/libxmlpp-2.36.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libxml2-2.7.3[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(-)?] >=dev-cpp/glibmm-2.32[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=2.6
 SRC_URI=mirror://gnome/sources/libxml++/2.36/libxml++-2.36.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a965c3879c23906f47144cf59191cd38
diff --git a/metadata/md5-cache/dev-cpp/libxmlpp-2.38.0 b/metadata/md5-cache/dev-cpp/libxmlpp-2.38.0
index 671298f3b7d7..33b5471b4703 100644
--- a/metadata/md5-cache/dev-cpp/libxmlpp-2.38.0
+++ b/metadata/md5-cache/dev-cpp/libxmlpp-2.38.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libxml2-2.7.3[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(-)?] >=dev-cpp/glibmm-2.32[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=2.6
 SRC_URI=mirror://gnome/sources/libxml++/2.38/libxml++-2.38.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5913a3760b5965021bdba49fd2446cd3
diff --git a/metadata/md5-cache/dev-cpp/libxmlpp-2.38.1 b/metadata/md5-cache/dev-cpp/libxmlpp-2.38.1
index b01cc1db3f3f..cb491a697801 100644
--- a/metadata/md5-cache/dev-cpp/libxmlpp-2.38.1
+++ b/metadata/md5-cache/dev-cpp/libxmlpp-2.38.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/libxml2-2.7.7[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(-)?] >=dev-cpp/glibmm-2.32[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=2.6
 SRC_URI=mirror://gnome/sources/libxml++/2.38/libxml++-2.38.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c3c437b3e1fc6d5abfc42bc5ff2365bc
diff --git a/metadata/md5-cache/dev-cpp/pangomm-2.34.0-r1 b/metadata/md5-cache/dev-cpp/pangomm-2.34.0-r1
index a4212dfa9183..b1f9a1115df2 100644
--- a/metadata/md5-cache/dev-cpp/pangomm-2.34.0-r1
+++ b/metadata/md5-cache/dev-cpp/pangomm-2.34.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=x11-libs/pango-1.32.5[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(-)?] >=dev-cpp/glibmm-2.36.0:2[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(-)?] >=dev-cpp/cairomm-1.10.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(-)?] >=dev-libs/libsigc++-2.3.2:2[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(-)?] !<dev-cpp/gtkmm-2.13:2.4 abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtkmmlibs-20140508 !app-emulation/emul-linux-x86-gtkmmlibs[-abi_x86_32(-)] )
 SLOT=1.4
 SRC_URI=mirror://gnome/sources/pangomm/2.34/pangomm-2.34.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=382fa5691ca7c68794f7895a6f70f2bd
diff --git a/metadata/md5-cache/dev-cpp/pangomm-2.36.0 b/metadata/md5-cache/dev-cpp/pangomm-2.36.0
index 78f03e750915..3dfb034a1d5b 100644
--- a/metadata/md5-cache/dev-cpp/pangomm-2.36.0
+++ b/metadata/md5-cache/dev-cpp/pangomm-2.36.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=x11-libs/pango-1.36[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(-)?] >=dev-cpp/glibmm-2.36.0:2[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(-)?] >=dev-cpp/cairomm-1.10.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(-)?] >=dev-libs/libsigc++-2.3.2:2[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(-)?] !<dev-cpp/gtkmm-2.13:2.4 abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtkmmlibs-20140508 !app-emulation/emul-linux-x86-gtkmmlibs[-abi_x86_32(-)] )
 SLOT=1.4
 SRC_URI=mirror://gnome/sources/pangomm/2.36/pangomm-2.36.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=15c1df070e3d51a4de2d3913c5422105
diff --git a/metadata/md5-cache/dev-cpp/sparsehash-1.1 b/metadata/md5-cache/dev-cpp/sparsehash-1.1
deleted file mode 100644
index 0aad9d39ef3d..000000000000
--- a/metadata/md5-cache/dev-cpp/sparsehash-1.1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=An extremely memory-efficient hash_map implementation
-HOMEPAGE=http://code.google.com/p/google-sparsehash/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://google-sparsehash.googlecode.com/files/sparsehash-1.1.tar.gz
-_md5_=3743f8c9d13aa12181c383ebd8d54298
diff --git a/metadata/md5-cache/dev-cpp/sparsehash-1.5.2 b/metadata/md5-cache/dev-cpp/sparsehash-1.5.2
deleted file mode 100644
index b7c052eb05a2..000000000000
--- a/metadata/md5-cache/dev-cpp/sparsehash-1.5.2
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=An extremely memory-efficient hash_map implementation
-HOMEPAGE=http://code.google.com/p/google-sparsehash/
-KEYWORDS=amd64 x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://google-sparsehash.googlecode.com/files/sparsehash-1.5.2.tar.gz
-_md5_=5202ccca84ec58f28b9b5b4b5cf0606a
diff --git a/metadata/md5-cache/dev-cpp/tbb-4.3.20141023 b/metadata/md5-cache/dev-cpp/tbb-4.3.20141023
index 7f6b1675db62..36e8e76ea3da 100644
--- a/metadata/md5-cache/dev-cpp/tbb-4.3.20141023
+++ b/metadata/md5-cache/dev-cpp/tbb-4.3.20141023
@@ -3,9 +3,9 @@ DESCRIPTION=High level abstract threading library
 EAPI=5
 HOMEPAGE=http://www.threadingbuildingblocks.org/
 IUSE=debug doc examples
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2-with-exceptions
 SLOT=0
 SRC_URI=http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb43_20141023oss_src.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a66050dfb3e5612bc95147371149a2e9
+_md5_=f5df1ff101799c282b88c01d6cb826ac
diff --git a/metadata/md5-cache/dev-cpp/tbb-4.3.20141023-r1 b/metadata/md5-cache/dev-cpp/tbb-4.3.20141023-r1
index ed34b7868c71..f2ebb70b1bc5 100644
--- a/metadata/md5-cache/dev-cpp/tbb-4.3.20141023-r1
+++ b/metadata/md5-cache/dev-cpp/tbb-4.3.20141023-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2-with-exceptions
 SLOT=0
 SRC_URI=http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb43_20141023oss_src.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=640266f87584b7e0228fa50dbfaa2bea
diff --git a/metadata/md5-cache/dev-cpp/tbb-4.3.20150611 b/metadata/md5-cache/dev-cpp/tbb-4.3.20150611
index 132974d631fe..1272af6fb759 100644
--- a/metadata/md5-cache/dev-cpp/tbb-4.3.20150611
+++ b/metadata/md5-cache/dev-cpp/tbb-4.3.20150611
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2-with-exceptions
 SLOT=0
 SRC_URI=http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb43_20150611oss_src.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ab51995fd0d00e3a34e92a9c80d85ff3
diff --git a/metadata/md5-cache/dev-db/ctdb-1.0.114_p1 b/metadata/md5-cache/dev-db/ctdb-1.0.114_p1
deleted file mode 100644
index cdababc6b42a..000000000000
--- a/metadata/md5-cache/dev-db/ctdb-1.0.114_p1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare test unpack
-DEPEND=dev-libs/popt test? ( sys-apps/iproute2 sys-process/procps ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=app-arch/rpm2targz-9.0.0.3g
-DESCRIPTION=A cluster implementation of the TDB database used to store temporary data
-EAPI=2
-HOMEPAGE=http://ctdb.samba.org/
-IUSE=test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/popt
-SLOT=0
-SRC_URI=http://ctdb.samba.org/packages/redhat/RHEL5/ctdb-1.0.114-1.src.rpm http://ctdb.samba.org/packages/redhat/RHEL5/old/ctdb-1.0.114-1.src.rpm
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	rpm	b94b54b44f14d6bee3e966c8f5c86fba	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=91da18b086205c5ee02b1e5592cb0c24
diff --git a/metadata/md5-cache/dev-db/ctdb-1.0.73 b/metadata/md5-cache/dev-db/ctdb-1.0.73
deleted file mode 100644
index bede4f858531..000000000000
--- a/metadata/md5-cache/dev-db/ctdb-1.0.73
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/popt !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A cluster implementation of the TDB database used to store temporary data
-EAPI=2
-HOMEPAGE=http://ctdb.samba.org/
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/popt
-SLOT=0
-SRC_URI=http://ctdb.samba.org/packages/redhat/RHEL5/ctdb-1.0.73.tgz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=b913b56693b1b584a38d07d34161dfe7
diff --git a/metadata/md5-cache/dev-db/ctdb-1.0.88 b/metadata/md5-cache/dev-db/ctdb-1.0.88
deleted file mode 100644
index e01ae034cb9b..000000000000
--- a/metadata/md5-cache/dev-db/ctdb-1.0.88
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/popt !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A cluster implementation of the TDB database used to store temporary data
-EAPI=2
-HOMEPAGE=http://ctdb.samba.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/popt
-SLOT=0
-SRC_URI=http://ctdb.samba.org/packages/redhat/RHEL5/ctdb-1.0.88.tgz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=7d0caa6c8af86f771a56104f74651f55
diff --git a/metadata/md5-cache/dev-db/ctdb-1.13 b/metadata/md5-cache/dev-db/ctdb-1.13
deleted file mode 100644
index 2d658cc19bcb..000000000000
--- a/metadata/md5-cache/dev-db/ctdb-1.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/popt
-DESCRIPTION=A cluster implementation of the TDB database used to store temporary data
-EAPI=4
-HOMEPAGE=http://ctdb.samba.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/popt
-SLOT=0
-SRC_URI=http://dev.gentooexperimental.org/~scarabeus/ctdb-1.13.tar.xz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=fa00c9f299e460e7dee85a809196f560
diff --git a/metadata/md5-cache/dev-db/ctdb-1.13-r1 b/metadata/md5-cache/dev-db/ctdb-1.13-r1
index d06e56c9feb8..8bcecb024863 100644
--- a/metadata/md5-cache/dev-db/ctdb-1.13-r1
+++ b/metadata/md5-cache/dev-db/ctdb-1.13-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/popt-1.16-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(-)?]
 SLOT=0
 SRC_URI=http://dev.gentooexperimental.org/~scarabeus/ctdb-1.13.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=cde8ae73a7e56522d26713556aa10a59
diff --git a/metadata/md5-cache/dev-db/ctdb-9999 b/metadata/md5-cache/dev-db/ctdb-9999
index e7cd92831ce7..30a84eab3bd2 100644
--- a/metadata/md5-cache/dev-db/ctdb-9999
+++ b/metadata/md5-cache/dev-db/ctdb-9999
@@ -7,5 +7,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/popt-1.16-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(-)?]
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=18d1be996ebaa982fbe5fb11b60cae35
diff --git a/metadata/md5-cache/dev-db/drizzle-7.1.33 b/metadata/md5-cache/dev-db/drizzle-7.1.33
deleted file mode 100644
index b2255cfff3e1..000000000000
--- a/metadata/md5-cache/dev-db/drizzle-7.1.33
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=tcmalloc? ( dev-util/google-perftools ) sys-libs/readline sys-apps/util-linux dev-libs/libpcre >=dev-libs/libevent-1.4 >=dev-libs/protobuf-2.1.0 gearman? ( >=sys-cluster/gearmand-0.12 ) pam? ( sys-libs/pam ) curl? ( net-misc/curl ) memcache? ( >=dev-libs/libmemcached-0.39 ) md5? ( >=dev-libs/libgcrypt-1.4.2:0 ) haildb? ( >=dev-db/haildb-2.3.2 ) >=dev-libs/boost-1.32 ldap? ( net-nds/openldap ) !dev-db/libdrizzle sys-devel/gettext dev-util/intltool dev-util/gperf sys-devel/flex doc? ( app-doc/doxygen ) >=dev-util/boost-build-1.32 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Database optimized for Cloud and Net applications
-EAPI=2
-HOMEPAGE=http://drizzle.org
-IUSE=debug tcmalloc doc memcache curl pam gearman +md5 ldap haildb
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=tcmalloc? ( dev-util/google-perftools ) sys-libs/readline sys-apps/util-linux dev-libs/libpcre >=dev-libs/libevent-1.4 >=dev-libs/protobuf-2.1.0 gearman? ( >=sys-cluster/gearmand-0.12 ) pam? ( sys-libs/pam ) curl? ( net-misc/curl ) memcache? ( >=dev-libs/libmemcached-0.39 ) md5? ( >=dev-libs/libgcrypt-1.4.2:0 ) haildb? ( >=dev-db/haildb-2.3.2 ) >=dev-libs/boost-1.32 ldap? ( net-nds/openldap ) !dev-db/libdrizzle
-SLOT=0
-SRC_URI=http://launchpad.net/drizzle/7.1/7.1.33/+download/drizzle-7.1.33-stable.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=89db4aa2d6c466cf48296e802e648f30
diff --git a/metadata/md5-cache/dev-db/freetds-0.64 b/metadata/md5-cache/dev-db/freetds-0.64
deleted file mode 100644
index 25f71b8505b0..000000000000
--- a/metadata/md5-cache/dev-db/freetds-0.64
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=odbc? ( dev-db/unixODBC )
-DESCRIPTION=Tabular Datastream Library
-HOMEPAGE=http://www.freetds.org/
-IUSE=odbc mssql
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=odbc? ( dev-db/unixODBC )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-0.64.tar.gz
-_md5_=4c1d27d7ccfb3f6c4690366687935d45
diff --git a/metadata/md5-cache/dev-db/freetds-0.82-r3 b/metadata/md5-cache/dev-db/freetds-0.82-r3
deleted file mode 100644
index 91a377efe65d..000000000000
--- a/metadata/md5-cache/dev-db/freetds-0.82-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Tabular Datastream Library
-EAPI=3
-HOMEPAGE=http://www.freetds.org/
-IUSE=odbc iodbc mssql
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-0.82.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=e992eadb1db259d7a4df6c9241e68ca3
diff --git a/metadata/md5-cache/dev-db/haildb-2.2.0 b/metadata/md5-cache/dev-db/haildb-2.2.0
deleted file mode 100644
index 41a1f8e6cf6f..000000000000
--- a/metadata/md5-cache/dev-db/haildb-2.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=tcmalloc? ( dev-util/google-perftools ) zlib? ( sys-libs/zlib ) sys-devel/bison
-DESCRIPTION=a relational database in shared library form
-EAPI=2
-HOMEPAGE=http://www.haildb.com/
-IUSE=debug tcmalloc zlib
-KEYWORDS=~amd64
-LICENSE=GPL-2 MIT
-RDEPEND=tcmalloc? ( dev-util/google-perftools ) zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=http://launchpad.net/haildb/2.x/2.2/+download/haildb-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6c6b290db4835a99b9f2199c87d41e8c
diff --git a/metadata/md5-cache/dev-db/haildb-2.3.1 b/metadata/md5-cache/dev-db/haildb-2.3.1
deleted file mode 100644
index 645481662ba3..000000000000
--- a/metadata/md5-cache/dev-db/haildb-2.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=tcmalloc? ( dev-util/google-perftools ) zlib? ( sys-libs/zlib ) sys-devel/bison
-DESCRIPTION=a relational database in shared library form
-EAPI=2
-HOMEPAGE=http://www.haildb.com/
-IUSE=debug tcmalloc zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 MIT
-RDEPEND=tcmalloc? ( dev-util/google-perftools ) zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=http://launchpad.net/haildb/2.3/athens/+download/haildb-2.3.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=dabfcd0cb91008ead86cfe9eb8ddda05
diff --git a/metadata/md5-cache/dev-db/libiodbc-3.52.8-r2 b/metadata/md5-cache/dev-db/libiodbc-3.52.8-r2
index a82eece3ab10..92a7b0041250 100644
--- a/metadata/md5-cache/dev-db/libiodbc-3.52.8-r2
+++ b/metadata/md5-cache/dev-db/libiodbc-3.52.8-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2 BSD )
 RDEPEND=gtk? ( x11-libs/gtk+:2[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
 SRC_URI=https://github.com/openlink/iODBC/archive/v3.52.8.zip -> libiodbc-3.52.8.zip
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c9f2789346764bcfa05812a2f8f9e178
diff --git a/metadata/md5-cache/dev-db/m17n-contrib-1.1.10 b/metadata/md5-cache/dev-db/m17n-contrib-1.1.10
deleted file mode 100644
index 7550517a6d2e..000000000000
--- a/metadata/md5-cache/dev-db/m17n-contrib-1.1.10
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-db/m17n-db
-DESCRIPTION=Contribution database for the m17n library
-HOMEPAGE=https://savannah.nongnu.org/projects/m17n
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-db/m17n-db
-SLOT=0
-SRC_URI=http://www.m17n.org/m17n-lib-download/m17n-contrib-1.1.10.tar.gz
-_md5_=ba4ebeaa65cbca344570d8738532ae69
diff --git a/metadata/md5-cache/dev-db/m17n-contrib-1.1.12 b/metadata/md5-cache/dev-db/m17n-contrib-1.1.12
deleted file mode 100644
index 342082126419..000000000000
--- a/metadata/md5-cache/dev-db/m17n-contrib-1.1.12
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Contribution database for the m17n library
-EAPI=4
-HOMEPAGE=https://savannah.nongnu.org/projects/m17n
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-db/m17n-db
-SLOT=0
-SRC_URI=http://www.m17n.org/m17n-lib-download/m17n-contrib-1.1.12.tar.gz
-_md5_=b9b6e9af3ed3e086720b6001b85ebd02
diff --git a/metadata/md5-cache/dev-db/m17n-contrib-1.1.7 b/metadata/md5-cache/dev-db/m17n-contrib-1.1.7
deleted file mode 100644
index 9e2e9d22cd71..000000000000
--- a/metadata/md5-cache/dev-db/m17n-contrib-1.1.7
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-db/m17n-db
-DESCRIPTION=Contribution database for the m17n library
-HOMEPAGE=https://savannah.nongnu.org/projects/m17n
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-db/m17n-db
-SLOT=0
-SRC_URI=http://www.m17n.org/m17n-lib-download/m17n-contrib-1.1.7.tar.gz
-_md5_=84abea97bb3c4b83569d134707a9b918
diff --git a/metadata/md5-cache/dev-db/m17n-contrib-1.1.8 b/metadata/md5-cache/dev-db/m17n-contrib-1.1.8
deleted file mode 100644
index 55b3fad01966..000000000000
--- a/metadata/md5-cache/dev-db/m17n-contrib-1.1.8
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-db/m17n-db
-DESCRIPTION=Contribution database for the m17n library
-HOMEPAGE=https://savannah.nongnu.org/projects/m17n
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-db/m17n-db
-SLOT=0
-SRC_URI=http://www.m17n.org/m17n-lib-download/m17n-contrib-1.1.8.tar.gz
-_md5_=ebd0e7d724e8e42b2bc5e069e64fa8cf
diff --git a/metadata/md5-cache/dev-db/m17n-contrib-1.1.9 b/metadata/md5-cache/dev-db/m17n-contrib-1.1.9
deleted file mode 100644
index 82d89285a1c4..000000000000
--- a/metadata/md5-cache/dev-db/m17n-contrib-1.1.9
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-db/m17n-db
-DESCRIPTION=Contribution database for the m17n library
-HOMEPAGE=https://savannah.nongnu.org/projects/m17n
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-db/m17n-db
-SLOT=0
-SRC_URI=http://www.m17n.org/m17n-lib-download/m17n-contrib-1.1.9.tar.gz
-_md5_=0a10fb384d604bb8293f2c6123210f40
diff --git a/metadata/md5-cache/dev-db/m17n-db-1.5.3 b/metadata/md5-cache/dev-db/m17n-db-1.5.3
deleted file mode 100644
index c9e90c7e4db9..000000000000
--- a/metadata/md5-cache/dev-db/m17n-db-1.5.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-devel/gettext
-DESCRIPTION=Database for the m17n library
-HOMEPAGE=https://savannah.nongnu.org/projects/m17n
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=virtual/libintl
-SLOT=0
-SRC_URI=http://www.m17n.org/m17n-lib-download/m17n-db-1.5.3.tar.gz
-_md5_=c3a19718c53578ce052eae4a34f2f739
diff --git a/metadata/md5-cache/dev-db/m17n-db-1.5.4 b/metadata/md5-cache/dev-db/m17n-db-1.5.4
deleted file mode 100644
index a12d20f826b2..000000000000
--- a/metadata/md5-cache/dev-db/m17n-db-1.5.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-devel/gettext
-DESCRIPTION=Database for the m17n library
-HOMEPAGE=https://savannah.nongnu.org/projects/m17n
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=virtual/libintl
-SLOT=0
-SRC_URI=http://www.m17n.org/m17n-lib-download/m17n-db-1.5.4.tar.gz
-_md5_=f0b18e30f195e255e9c47a94f7a3dce4
diff --git a/metadata/md5-cache/dev-db/mariadb-10.0.16 b/metadata/md5-cache/dev-db/mariadb-10.0.16
index 68f944f1d012..4340cf20665f 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.0.16
+++ b/metadata/md5-cache/dev-db/mariadb-10.0.16
@@ -12,5 +12,5 @@ REQUIRED_USE=minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc ) tcmalloc? ( !jem
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-10.0.16/source/mariadb-10.0.16.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-10.0.16/source/mariadb-10.0.16.tar.gz http://mirrors.coreix.net/mariadb/mariadb-10.0.16/source/mariadb-10.0.16.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-10.0.16/source/mariadb-10.0.16.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-10.0.16/source/mariadb-10.0.16.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-10.0.16/source/mariadb-10.0.16.tar.gz http://ftp.osuosl.org/pub/mariadb/mariadb-10.0.16/kvm-tarbake-jaunty-x86/mariadb-10.0.16.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-10.0.16/kvm-tarbake-jaunty-x86/mariadb-10.0.16.tar.gz http://mirrors.coreix.net/mariadb/mariadb-10.0.16/kvm-tarbake-jaunty-x86/mariadb-10.0.16.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-10.0.16/kvm-tarbake-jaunty-x86/mariadb-10.0.16.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-10.0.16/kvm-tarbake-jaunty-x86/mariadb-10.0.16.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-10.0.16/kvm-tarbake-jaunty-x86/mariadb-10.0.16.tar.gz mirror://gentoo/mysql-extras-20141215-0144Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20141215-0144Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20141215-0144Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20141215-0144Z.tar.bz2
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-multilib	9af3ad0827a38d9d489121c8c336dc9e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-multilib	9af3ad0827a38d9d489121c8c336dc9e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=321d3740d823f81f0e36c29a23b1fa8d
diff --git a/metadata/md5-cache/dev-db/mariadb-10.0.19 b/metadata/md5-cache/dev-db/mariadb-10.0.19
index 375ac721cb2c..dbef2fafba85 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.0.19
+++ b/metadata/md5-cache/dev-db/mariadb-10.0.19
@@ -12,5 +12,5 @@ REQUIRED_USE=minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc ) tcmalloc? ( !jem
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-10.0.19/source/mariadb-10.0.19.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-10.0.19/source/mariadb-10.0.19.tar.gz http://mirrors.coreix.net/mariadb/mariadb-10.0.19/source/mariadb-10.0.19.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-10.0.19/source/mariadb-10.0.19.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-10.0.19/source/mariadb-10.0.19.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-10.0.19/source/mariadb-10.0.19.tar.gz http://ftp.osuosl.org/pub/mariadb/mariadb-10.0.19/kvm-tarbake-jaunty-x86/mariadb-10.0.19.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-10.0.19/kvm-tarbake-jaunty-x86/mariadb-10.0.19.tar.gz http://mirrors.coreix.net/mariadb/mariadb-10.0.19/kvm-tarbake-jaunty-x86/mariadb-10.0.19.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-10.0.19/kvm-tarbake-jaunty-x86/mariadb-10.0.19.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-10.0.19/kvm-tarbake-jaunty-x86/mariadb-10.0.19.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-10.0.19/kvm-tarbake-jaunty-x86/mariadb-10.0.19.tar.gz mirror://gentoo/mysql-extras-20141215-0144Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20141215-0144Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20141215-0144Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20141215-0144Z.tar.bz2
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-multilib	9af3ad0827a38d9d489121c8c336dc9e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-multilib	9af3ad0827a38d9d489121c8c336dc9e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cc4b8355e1d0d9b479384c110090f7a0
diff --git a/metadata/md5-cache/dev-db/mariadb-10.0.20 b/metadata/md5-cache/dev-db/mariadb-10.0.20
index 67b00d5292cd..1a7e02be04e6 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.0.20
+++ b/metadata/md5-cache/dev-db/mariadb-10.0.20
@@ -12,5 +12,5 @@ REQUIRED_USE=minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc ) tcmalloc? ( !jem
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-10.0.20/source/mariadb-10.0.20.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-10.0.20/source/mariadb-10.0.20.tar.gz http://mirrors.coreix.net/mariadb/mariadb-10.0.20/source/mariadb-10.0.20.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-10.0.20/source/mariadb-10.0.20.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-10.0.20/source/mariadb-10.0.20.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-10.0.20/source/mariadb-10.0.20.tar.gz http://ftp.osuosl.org/pub/mariadb/mariadb-10.0.20/kvm-tarbake-jaunty-x86/mariadb-10.0.20.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-10.0.20/kvm-tarbake-jaunty-x86/mariadb-10.0.20.tar.gz http://mirrors.coreix.net/mariadb/mariadb-10.0.20/kvm-tarbake-jaunty-x86/mariadb-10.0.20.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-10.0.20/kvm-tarbake-jaunty-x86/mariadb-10.0.20.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-10.0.20/kvm-tarbake-jaunty-x86/mariadb-10.0.20.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-10.0.20/kvm-tarbake-jaunty-x86/mariadb-10.0.20.tar.gz mirror://gentoo/mysql-extras-20141215-0144Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20141215-0144Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20141215-0144Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20141215-0144Z.tar.bz2
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-multilib	9af3ad0827a38d9d489121c8c336dc9e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-multilib	9af3ad0827a38d9d489121c8c336dc9e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8b65f15689a9654f7f3528cc06a14469
diff --git a/metadata/md5-cache/dev-db/mariadb-galera-10.0.19 b/metadata/md5-cache/dev-db/mariadb-galera-10.0.19
index b0c1ad9d4437..797997343706 100644
--- a/metadata/md5-cache/dev-db/mariadb-galera-10.0.19
+++ b/metadata/md5-cache/dev-db/mariadb-galera-10.0.19
@@ -12,5 +12,5 @@ REQUIRED_USE=minimal? ( !oqgraph !sphinx ) tokudb? ( jemalloc ) tcmalloc? ( !jem
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-galera-10.0.19/source/mariadb-galera-10.0.19.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-galera-10.0.19/source/mariadb-galera-10.0.19.tar.gz http://mirrors.coreix.net/mariadb/mariadb-galera-10.0.19/source/mariadb-galera-10.0.19.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-galera-10.0.19/source/mariadb-galera-10.0.19.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-galera-10.0.19/source/mariadb-galera-10.0.19.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-galera-10.0.19/source/mariadb-galera-10.0.19.tar.gz http://ftp.osuosl.org/pub/mariadb/mariadb-galera-10.0.19/kvm-tarbake-jaunty-x86/mariadb-galera-10.0.19.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-galera-10.0.19/kvm-tarbake-jaunty-x86/mariadb-galera-10.0.19.tar.gz http://mirrors.coreix.net/mariadb/mariadb-galera-10.0.19/kvm-tarbake-jaunty-x86/mariadb-galera-10.0.19.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-galera-10.0.19/kvm-tarbake-jaunty-x86/mariadb-galera-10.0.19.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-galera-10.0.19/kvm-tarbake-jaunty-x86/mariadb-galera-10.0.19.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-galera-10.0.19/kvm-tarbake-jaunty-x86/mariadb-galera-10.0.19.tar.gz mirror://gentoo/mysql-extras-20141215-0144Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20141215-0144Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20141215-0144Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20141215-0144Z.tar.bz2
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-multilib	9af3ad0827a38d9d489121c8c336dc9e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-multilib	9af3ad0827a38d9d489121c8c336dc9e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ea6f89088231b1e8b1723c5b48bc450e
diff --git a/metadata/md5-cache/dev-db/myodbc-5.2.7-r1 b/metadata/md5-cache/dev-db/myodbc-5.2.7-r1
index 1560f19cf48f..169dd32fa615 100644
--- a/metadata/md5-cache/dev-db/myodbc-5.2.7-r1
+++ b/metadata/md5-cache/dev-db/myodbc-5.2.7-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-db/unixODBC[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n
 RESTRICT=primaryuri
 SLOT=5.2
 SRC_URI=mirror://mysql/Downloads/Connector-ODBC/5.2/mysql-connector-odbc-5.2.7-src.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=578bf978c2dbbc5350b7908b691cce38
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.24 b/metadata/md5-cache/dev-db/mysql-5.6.24
index b2e90df40e11..0759f99a7566 100644
--- a/metadata/md5-cache/dev-db/mysql-5.6.24
+++ b/metadata/md5-cache/dev-db/mysql-5.6.24
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !extraengine !embedded ) static? ( !ssl )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.6/mysql-5.6.24.tar.gz mirror://mysql/Downloads/MySQL-5.6/mysql-5.6.24.tar.gz mirror://gentoo/mysql-extras-20150410-1944Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20150410-1944Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20150410-1944Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20150410-1944Z.tar.bz2
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-multilib	9af3ad0827a38d9d489121c8c336dc9e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-multilib	9af3ad0827a38d9d489121c8c336dc9e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2fbfb33dc4c08d8e1603bada644bb4ac
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.25 b/metadata/md5-cache/dev-db/mysql-5.6.25
index ae42af714bc7..f609f9fb9280 100644
--- a/metadata/md5-cache/dev-db/mysql-5.6.25
+++ b/metadata/md5-cache/dev-db/mysql-5.6.25
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !extraengine !embedded ) static? ( !ssl )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-5.6/mysql-5.6.25.tar.gz mirror://mysql/Downloads/MySQL-5.6/mysql-5.6.25.tar.gz mirror://gentoo/mysql-extras-20150410-1944Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20150410-1944Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20150410-1944Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20150410-1944Z.tar.bz2
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-multilib	9af3ad0827a38d9d489121c8c336dc9e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-multilib	9af3ad0827a38d9d489121c8c336dc9e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a8f5af1f3266cea4727cb11b4e5c843a
diff --git a/metadata/md5-cache/dev-db/mysql-cluster-7.3.8 b/metadata/md5-cache/dev-db/mysql-cluster-7.3.8
index d8ec6ac519a1..32e44026cb08 100644
--- a/metadata/md5-cache/dev-db/mysql-cluster-7.3.8
+++ b/metadata/md5-cache/dev-db/mysql-cluster-7.3.8
@@ -11,5 +11,5 @@ RDEPEND=!media-sound/amarok[embedded] java? ( >=dev-java/java-config-2.2.0 ) ssl
 REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !extraengine !embedded ) static? ( !ssl )
 SLOT=0
 SRC_URI=http://downloads.mysql.com/archives/mysql-cluster-gpl-7.3/mysql-cluster-gpl-7.3.8.tar.gz mirror://mysql/Downloads/MySQL-Cluster-7.3/mysql-cluster-gpl-7.3.8.tar.gz mirror://gentoo/mysql-extras-20150210-1758Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20150210-1758Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20150210-1758Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20150210-1758Z.tar.bz2
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-multilib	9af3ad0827a38d9d489121c8c336dc9e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-multilib	9af3ad0827a38d9d489121c8c336dc9e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=08ded211f8c3bf19026b215fb420b0d6
diff --git a/metadata/md5-cache/dev-db/mysql-proxy-0.8.0-r1 b/metadata/md5-cache/dev-db/mysql-proxy-0.8.0-r1
deleted file mode 100644
index 9f5fda344ee4..000000000000
--- a/metadata/md5-cache/dev-db/mysql-proxy-0.8.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=>=dev-libs/libevent-1.4 >=dev-libs/glib-2.16 >=dev-lang/lua-5.1 >=virtual/mysql-5.0 virtual/pkgconfig
-DESCRIPTION=A Proxy for the MySQL Client/Server protocol
-EAPI=2
-HOMEPAGE=http://forge.mysql.com/wiki/MySQL_Proxy
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libevent-1.4 >=dev-libs/glib-2.16 >=dev-lang/lua-5.1
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://mysql/Downloads/MySQL-Proxy/mysql-proxy-0.8.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=a22c743634c102e8068f3670ff4234ea
diff --git a/metadata/md5-cache/dev-db/mysql-proxy-0.8.2 b/metadata/md5-cache/dev-db/mysql-proxy-0.8.2
deleted file mode 100644
index c7d110403d75..000000000000
--- a/metadata/md5-cache/dev-db/mysql-proxy-0.8.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=<dev-libs/libevent-2.1 >=dev-libs/glib-2.16 >=dev-lang/lua-5.1 >=virtual/mysql-5.0 virtual/pkgconfig
-DESCRIPTION=A Proxy for the MySQL Client/Server protocol
-EAPI=2
-HOMEPAGE=http://forge.mysql.com/wiki/MySQL_Proxy
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=<dev-libs/libevent-2.1 >=dev-libs/glib-2.16 >=dev-lang/lua-5.1
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://mysql/Downloads/MySQL-Proxy/mysql-proxy-0.8.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=862c7237fa9153202a8ebad61342318d
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-6.0.9 b/metadata/md5-cache/dev-db/mysql-workbench-6.0.9
deleted file mode 100644
index 78c355cb4292..000000000000
--- a/metadata/md5-cache/dev-db/mysql-workbench-6.0.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-lang/python-2.7.5-r2:2.7[sqlite] >=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(+)] dev-libs/glib:2 dev-cpp/atkmm dev-cpp/pangomm >=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.14:2.4 dev-libs/atk x11-libs/pango >=x11-libs/gtk+-2.6:2 gnome-base/libglade:2.0 >=x11-libs/cairo-1.5.12[glib,svg] dev-libs/libsigc++:2 dev-libs/boost >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip >=virtual/mysql-5.1 dev-libs/libpcre virtual/opengl >=dev-lang/lua-5.1[deprecated] || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] dev-db/mysql-connector-c++ dev-db/vsqlite++ !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) gnome-keyring? ( gnome-base/libgnome-keyring ) dev-python/pexpect >=dev-python/paramiko-1.7.4 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.11.1 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=MySQL Workbench
-EAPI=5
-HOMEPAGE=http://dev.mysql.com/workbench/
-IUSE=debug doc gnome-keyring +iodbc python_targets_python2_7
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[sqlite] >=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(+)] dev-libs/glib:2 dev-cpp/atkmm dev-cpp/pangomm >=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.14:2.4 dev-libs/atk x11-libs/pango >=x11-libs/gtk+-2.6:2 gnome-base/libglade:2.0 >=x11-libs/cairo-1.5.12[glib,svg] dev-libs/libsigc++:2 dev-libs/boost >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip >=virtual/mysql-5.1 dev-libs/libpcre virtual/opengl >=dev-lang/lua-5.1[deprecated] || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] dev-db/mysql-connector-c++ dev-db/vsqlite++ !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) gnome-keyring? ( gnome-base/libgnome-keyring ) dev-python/pexpect >=dev-python/paramiko-1.7.4 app-admin/sudo >=sys-apps/net-tools-1.60_p20120127084908
-SLOT=0
-SRC_URI=mirror://mysql/Downloads/MySQLGUITools/mysql-workbench-community-6.0.9-src.tar.gz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=18538ac55436cf93e0f37d1359f907de
diff --git a/metadata/md5-cache/dev-db/mysql-workbench-6.3.3 b/metadata/md5-cache/dev-db/mysql-workbench-6.3.3
index 1842dd1324d9..53ac6c56c8cc 100644
--- a/metadata/md5-cache/dev-db/mysql-workbench-6.3.3
+++ b/metadata/md5-cache/dev-db/mysql-workbench-6.3.3
@@ -4,10 +4,10 @@ DESCRIPTION=MySQL Workbench
 EAPI=5
 HOMEPAGE=http://dev.mysql.com/workbench/
 IUSE=debug doc gnome-keyring python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/python-2.7.5-r2:2.7[sqlite] >=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(+)] dev-libs/glib:2 dev-cpp/atkmm dev-cpp/pangomm >=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.14:2.4 dev-libs/atk x11-libs/pango >=x11-libs/gtk+-2.20:2 gnome-base/libglade:2.0 >=x11-libs/cairo-1.5.12[glib,svg] dev-libs/libsigc++:2 dev-libs/boost >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 dev-libs/libzip >=virtual/mysql-5.1 dev-libs/libpcre >=sci-libs/gdal-1.11.1-r1[-mdb] virtual/opengl >=dev-lang/lua-5.1[deprecated] || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) dev-libs/tinyxml[stl] dev-db/mysql-connector-c++ dev-db/vsqlite++ || ( dev-db/libiodbc dev-db/unixODBC ) gnome-keyring? ( gnome-base/libgnome-keyring ) dev-python/pexpect >=dev-python/paramiko-1.7.4 app-admin/sudo >=sys-apps/net-tools-1.60_p20120127084908
 SLOT=0
 SRC_URI=mirror://mysql/Downloads/MySQLGUITools/mysql-workbench-community-6.3.3-src.tar.gz https://github.com/antlr/website-antlr3/blob/gh-pages/download/antlr-3.4-complete.jar?raw=true -> antlr-3.4-complete.jar
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f32aad3e166de8b3efc12511b28d6c63
+_md5_=a769478906749461021a5735f32588ac
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-basic-11.2.0.4 b/metadata/md5-cache/dev-db/oracle-instantclient-basic-11.2.0.4
index 53346891ff35..dfd8ca9ea97c 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-basic-11.2.0.4
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-basic-11.2.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libaio-0.3.109-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=fetch splitdebug
 SLOT=0
 SRC_URI=abi_x86_32? ( instantclient-basic-linux-11.2.0.4.0.zip !abi_x86_64? ( instantclient-sdk-linux-11.2.0.4.0.zip ) ) abi_x86_64? ( instantclient-basic-linux.x64-11.2.0.4.0.zip instantclient-sdk-linux.x64-11.2.0.4.0.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=926f8fdd0fc468620db90e8fee47866a
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.4 b/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.4
index e2b3071e1433..674886dd404a 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.4
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-jdbc-11.2.0.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-db/oracle-instantclient-basic-11.2.0.4
 RESTRICT=fetch splitdebug
 SLOT=0
 SRC_URI=abi_x86_32? ( instantclient-jdbc-linux-11.2.0.4.0.zip ) abi_x86_64? ( instantclient-jdbc-linux.x64-11.2.0.4.0.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=da3b6ccbd5a653032fdc7c4d3f9cff37
diff --git a/metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.4 b/metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.4
index 1a672015e224..8d0c39c3c45c 100644
--- a/metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.4
+++ b/metadata/md5-cache/dev-db/oracle-instantclient-odbc-11.2.0.4
@@ -10,5 +10,5 @@ RDEPEND=~dev-db/oracle-instantclient-basic-11.2.0.4
 RESTRICT=fetch splitdebug
 SLOT=0
 SRC_URI=abi_x86_32? ( instantclient-odbc-linux-11.2.0.4.0.zip ) abi_x86_64? ( instantclient-odbc-linux.x64-11.2.0.4.0.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=df8c91d5ae6a194d03bdf794cad79fcd
diff --git a/metadata/md5-cache/dev-db/percona-server-5.6.24.72.2 b/metadata/md5-cache/dev-db/percona-server-5.6.24.72.2
index 693ca7af7928..bdfb68e82a04 100644
--- a/metadata/md5-cache/dev-db/percona-server-5.6.24.72.2
+++ b/metadata/md5-cache/dev-db/percona-server-5.6.24.72.2
@@ -11,5 +11,5 @@ RDEPEND=ssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !extraengine !embedded ) static? ( !ssl )
 SLOT=0
 SRC_URI=http://www.percona.com/redir/downloads/Percona-Server-5.6/Percona-Server-5.6.24-72.2/source/tarball/percona-server-5.6.24-72.2.tar.gz mirror://gentoo/mysql-extras-20150113-1853Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20150113-1853Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20150113-1853Z.tar.bz2 http://dev.gentoo.org/~grknight/distfiles/mysql-extras-20150113-1853Z.tar.bz2
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-multilib	9af3ad0827a38d9d489121c8c336dc9e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	mysql-cmake	0b183f1f008c40a3df7ab3dbfdfc14d5	mysql-multilib	9af3ad0827a38d9d489121c8c336dc9e	mysql_fx	ab94d85c3c822792c72f7eeff96f2365	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8d183b1a90aa5207b57bec8e78f1b42b
diff --git a/metadata/md5-cache/dev-db/pgadmin3-1.20.0-r1 b/metadata/md5-cache/dev-db/pgadmin3-1.20.0-r1
index f9a1c72207e1..1a77939a7547 100644
--- a/metadata/md5-cache/dev-db/pgadmin3-1.20.0-r1
+++ b/metadata/md5-cache/dev-db/pgadmin3-1.20.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=wxWidgets GUI for PostgreSQL
 EAPI=5
 HOMEPAGE=http://www.pgadmin.org/
 IUSE=debug +databasedesigner
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=POSTGRESQL
 RDEPEND=x11-libs/wxGTK:=[X,debug=] >=dev-db/postgresql-8.4.0:= >=dev-libs/libxml2-2.6.18 >=dev-libs/libxslt-1.1
 SLOT=0
 SRC_URI=mirror://postgresql/pgadmin3/release/v1.20.0/src/pgadmin3-1.20.0.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=36e980b9ea7b54b01ae10e2bfddb04b2
+_md5_=924e036c416949006e379f282aba2394
diff --git a/metadata/md5-cache/dev-db/pgmemcache-2.0.4 b/metadata/md5-cache/dev-db/pgmemcache-2.0.4
deleted file mode 100644
index b36786951875..000000000000
--- a/metadata/md5-cache/dev-db/pgmemcache-2.0.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-db/postgresql-8.4 >=dev-libs/libmemcached-0.39
-DESCRIPTION=A PostgreSQL API based on libmemcached to interface with memcached
-HOMEPAGE=http://pgfoundry.org/projects/pgmemcache
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-db/postgresql-8.4 >=dev-libs/libmemcached-0.39
-SLOT=0
-SRC_URI=http://pgfoundry.org/frs/download.php/2672/pgmemcache_2.0.4.tar.bz2
-_md5_=fc62e74b740078136cd8a7355964416f
diff --git a/metadata/md5-cache/dev-db/pgmemcache-2.0.6 b/metadata/md5-cache/dev-db/pgmemcache-2.0.6
deleted file mode 100644
index 8cd4c6227ff9..000000000000
--- a/metadata/md5-cache/dev-db/pgmemcache-2.0.6
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-db/postgresql-8.4 dev-libs/cyrus-sasl >=dev-libs/libmemcached-0.39
-DESCRIPTION=A PostgreSQL API based on libmemcached to interface with memcached
-HOMEPAGE=http://pgfoundry.org/projects/pgmemcache
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-db/postgresql-8.4 dev-libs/cyrus-sasl >=dev-libs/libmemcached-0.39
-SLOT=0
-SRC_URI=http://pgfoundry.org/frs/download.php/3018/pgmemcache_2.0.6.tar.bz2
-_md5_=983b3ae5f323de697e3225ad4155be8f
diff --git a/metadata/md5-cache/dev-db/pgmemcache-2.1.1 b/metadata/md5-cache/dev-db/pgmemcache-2.1.1
deleted file mode 100644
index 0102d6235274..000000000000
--- a/metadata/md5-cache/dev-db/pgmemcache-2.1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=dev-db/postgresql-8.4 dev-libs/cyrus-sasl <dev-libs/libmemcached-1[sasl]
-DESCRIPTION=A PostgreSQL API based on libmemcached to interface with memcached
-EAPI=5
-HOMEPAGE=http://pgfoundry.org/projects/pgmemcache
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-db/postgresql-8.4 dev-libs/cyrus-sasl <dev-libs/libmemcached-1[sasl]
-SLOT=0
-SRC_URI=http://pgfoundry.org/frs/download.php/3018/pgmemcache_2.1.1.tar.bz2
-_md5_=2d0237320e3973d86e85f33147a1d2c2
diff --git a/metadata/md5-cache/dev-db/sqlcipher-3.3.0 b/metadata/md5-cache/dev-db/sqlcipher-3.3.0
index b508336b8550..57ca2e6cd992 100644
--- a/metadata/md5-cache/dev-db/sqlcipher-3.3.0
+++ b/metadata/md5-cache/dev-db/sqlcipher-3.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/openssl: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:=[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
 SRC_URI=https://github.com/sqlcipher/sqlcipher/archive/v3.3.0.tar.gz -> sqlcipher-3.3.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1ef508e566739c586c6ffb7b638afca8
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 3f9b61a8ef73..dd8230b21f70 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.8.10.1
+++ b/metadata/md5-cache/dev-db/sqlite-3.8.10.1
@@ -9,5 +9,5 @@ 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	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a00f59edae0faf411d4425f6ab5f431e
diff --git a/metadata/md5-cache/dev-db/sqlite-3.8.10.2 b/metadata/md5-cache/dev-db/sqlite-3.8.10.2
index 151e14f89668..6287d6045076 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.8.10.2
+++ b/metadata/md5-cache/dev-db/sqlite-3.8.10.2
@@ -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-3081002.zip ) tcl? ( http://sqlite.org/2015/sqlite-src-3081002.zip ) test? ( http://sqlite.org/2015/sqlite-src-3081002.zip ) tools? ( http://sqlite.org/2015/sqlite-src-3081002.zip ) !tcl? ( !test? ( !tools? ( http://sqlite.org/2015/sqlite-autoconf-3081002.tar.gz ) ) )
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=84524e79e4c585ece57e1e94224e0f38
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=600ee3853eaa1ff0c946de0432812530
diff --git a/metadata/md5-cache/dev-db/tokyocabinet-1.4.46 b/metadata/md5-cache/dev-db/tokyocabinet-1.4.46
deleted file mode 100644
index e70b0f0b1c8f..000000000000
--- a/metadata/md5-cache/dev-db/tokyocabinet-1.4.46
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=sys-libs/zlib app-arch/bzip2
-DESCRIPTION=A library of routines for managing a database
-EAPI=2
-HOMEPAGE=http://fallabs.com/tokyocabinet/
-IUSE=debug doc examples
-KEYWORDS=alpha amd64 hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=LGPL-2.1
-RDEPEND=sys-libs/zlib app-arch/bzip2
-SLOT=0
-SRC_URI=http://fallabs.com/tokyocabinet/tokyocabinet-1.4.46.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=c708a09467b7eaf6091440390b7cb2a7
diff --git a/metadata/md5-cache/dev-db/tokyocabinet-1.4.47 b/metadata/md5-cache/dev-db/tokyocabinet-1.4.47
deleted file mode 100644
index f8599d46ed6d..000000000000
--- a/metadata/md5-cache/dev-db/tokyocabinet-1.4.47
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=sys-libs/zlib app-arch/bzip2 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A library of routines for managing a database
-EAPI=2
-HOMEPAGE=http://fallabs.com/tokyocabinet/
-IUSE=debug doc examples
-KEYWORDS=alpha amd64 hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=LGPL-2.1
-RDEPEND=sys-libs/zlib app-arch/bzip2
-SLOT=0
-SRC_URI=http://fallabs.com/tokyocabinet/tokyocabinet-1.4.47.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=987da600cb8fc2fc285caf664ffcb787
diff --git a/metadata/md5-cache/dev-db/unixODBC-2.3.2-r1 b/metadata/md5-cache/dev-db/unixODBC-2.3.2-r1
index 96c3df224f70..d437f0e8eb32 100644
--- a/metadata/md5-cache/dev-db/unixODBC-2.3.2-r1
+++ b/metadata/md5-cache/dev-db/unixODBC-2.3.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=|| ( dev-libs/libltdl: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(-)?] >=sys-devel/libtool-2.4.2-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(-)?] ) >=sys-libs/readline-6.2_p5-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(-)?] >=sys-libs/ncurses-5.9-r3[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(-)?] >=virtual/libiconv-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.2.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=72a6265900d5ffe461230024f9a0180b
diff --git a/metadata/md5-cache/dev-db/unixODBC-2.3.2-r2 b/metadata/md5-cache/dev-db/unixODBC-2.3.2-r2
index d9b0dbffddd7..039fb9bf693b 100644
--- a/metadata/md5-cache/dev-db/unixODBC-2.3.2-r2
+++ b/metadata/md5-cache/dev-db/unixODBC-2.3.2-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=|| ( dev-libs/libltdl: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(-)?] >=sys-devel/libtool-2.4.2-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(-)?] ) >=sys-libs/readline-6.2_p5-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(-)?] >=sys-libs/ncurses-5.9-r3[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(-)?] >=virtual/libiconv-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.2.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7cca83ee15392b03426bbae7dc8ab05c
diff --git a/metadata/md5-cache/dev-embedded/gnap-ext-1.7 b/metadata/md5-cache/dev-embedded/gnap-ext-1.7
deleted file mode 100644
index 6e4dc67b351b..000000000000
--- a/metadata/md5-cache/dev-embedded/gnap-ext-1.7
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Gentoo-based Network Appliance extensions and remastering tool
-HOMEPAGE=http://embedded.gentoo.org/gnap.xml
-IUSE=minimal
-KEYWORDS=~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/squashfs-tools
-SLOT=0
-SRC_URI=mirror://gentoo/gnap-tools-1.7.tar.bz2 !minimal? ( mirror://gentoo/gnap-basefs-1.7.tar.bz2 mirror://gentoo/gnap-extensions-1.7.tar )
-_md5_=2b423ca1aa52a13ed95f76818372f3c3
diff --git a/metadata/md5-cache/dev-embedded/gnap-ext-1.7.1 b/metadata/md5-cache/dev-embedded/gnap-ext-1.7.1
deleted file mode 100644
index 75e7d12faa21..000000000000
--- a/metadata/md5-cache/dev-embedded/gnap-ext-1.7.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Gentoo-based Network Appliance extensions and remastering tool
-HOMEPAGE=http://embedded.gentoo.org/gnap.xml
-IUSE=minimal
-KEYWORDS=~x86
-LICENSE=GPL-2
-RDEPEND=sys-fs/squashfs-tools
-SLOT=0
-SRC_URI=mirror://gentoo/gnap-tools-1.7.1.tar.bz2 !minimal? ( mirror://gentoo/gnap-basefs-1.7.1.tar.bz2 mirror://gentoo/gnap-extensions-1.7.1.tar )
-_md5_=32348e55a6221a196ec6079b1f129dd4
diff --git a/metadata/md5-cache/dev-embedded/gnap-ext-1.8 b/metadata/md5-cache/dev-embedded/gnap-ext-1.8
deleted file mode 100644
index c30a5d24d063..000000000000
--- a/metadata/md5-cache/dev-embedded/gnap-ext-1.8
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Gentoo-based Network Appliance extensions and remastering tool
-HOMEPAGE=http://embedded.gentoo.org/gnap.xml
-IUSE=minimal
-KEYWORDS=~x86 ~amd64
-LICENSE=GPL-2
-RDEPEND=sys-fs/squashfs-tools
-SLOT=0
-SRC_URI=mirror://gentoo/gnap-tools-1.8.tar.bz2 !minimal? ( mirror://gentoo/gnap-basefs-1.8.tar.bz2 mirror://gentoo/gnap-extensions-1.8.tar )
-_md5_=f6ee961f73224c23f3f98b4a83a30a89
diff --git a/metadata/md5-cache/dev-embedded/gnap-ext-1.8.1 b/metadata/md5-cache/dev-embedded/gnap-ext-1.8.1
deleted file mode 100644
index 75baac8ebbeb..000000000000
--- a/metadata/md5-cache/dev-embedded/gnap-ext-1.8.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Gentoo-based Network Appliance extensions and remastering tool
-HOMEPAGE=http://embedded.gentoo.org/gnap.xml
-IUSE=minimal
-KEYWORDS=~x86 ~amd64
-LICENSE=GPL-2
-RDEPEND=sys-fs/squashfs-tools
-SLOT=0
-SRC_URI=mirror://gentoo/gnap-tools-1.8.1.tar.bz2 !minimal? ( mirror://gentoo/gnap-basefs-1.8.1.tar.bz2 mirror://gentoo/gnap-extensions-1.8.1.tar )
-_md5_=aed4860ce545ff6b9388bb0e42dd6d30
diff --git a/metadata/md5-cache/dev-embedded/gnap-ext-1.8.2 b/metadata/md5-cache/dev-embedded/gnap-ext-1.8.2
deleted file mode 100644
index 902de327bae5..000000000000
--- a/metadata/md5-cache/dev-embedded/gnap-ext-1.8.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Gentoo-based Network Appliance extensions and remastering tool
-HOMEPAGE=http://embedded.gentoo.org/gnap.xml
-IUSE=minimal
-KEYWORDS=~x86 ~amd64
-LICENSE=GPL-2
-RDEPEND=sys-fs/squashfs-tools
-SLOT=0
-SRC_URI=mirror://gentoo/gnap-tools-1.8.2.tar.bz2 !minimal? ( mirror://gentoo/gnap-basefs-1.8.2.tar.bz2 mirror://gentoo/gnap-extensions-1.8.2.tar )
-_md5_=c0cf2728d3e6041e63762ef782bd2fd0
diff --git a/metadata/md5-cache/dev-embedded/libftdi-0.17 b/metadata/md5-cache/dev-embedded/libftdi-0.17
deleted file mode 100644
index f8b5bb77acdd..000000000000
--- a/metadata/md5-cache/dev-embedded/libftdi-0.17
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( dev-lang/python ) doc? ( app-doc/doxygen )
-DESCRIPTION=Userspace access to FTDI USB interface chips
-EAPI=2
-HOMEPAGE=http://www.intra2net.com/en/developer/libftdi/
-IUSE=cxx doc examples python
-KEYWORDS=amd64 ppc ppc64 sparc x86
-LICENSE=LGPL-2
-RDEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( dev-lang/python )
-SLOT=0
-SRC_URI=http://www.intra2net.com/en/developer/libftdi/download/libftdi-0.17.tar.gz
-_md5_=c3e95db626ac052cbdc22567b1a848e8
diff --git a/metadata/md5-cache/dev-embedded/libftdi-0.18 b/metadata/md5-cache/dev-embedded/libftdi-0.18
deleted file mode 100644
index 1b7c93c221f4..000000000000
--- a/metadata/md5-cache/dev-embedded/libftdi-0.18
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( dev-lang/python ) doc? ( app-doc/doxygen )
-DESCRIPTION=Userspace access to FTDI USB interface chips
-EAPI=2
-HOMEPAGE=http://www.intra2net.com/en/developer/libftdi/
-IUSE=cxx doc examples python
-KEYWORDS=amd64 ppc ppc64 sparc x86
-LICENSE=LGPL-2
-RDEPEND=virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( dev-lang/python )
-SLOT=0
-SRC_URI=http://www.intra2net.com/en/developer/libftdi/download/libftdi-0.18.tar.gz
-_md5_=64167bc23f300c6dd416528975e09d15
diff --git a/metadata/md5-cache/dev-games/physfs-2.0.3-r1 b/metadata/md5-cache/dev-games/physfs-2.0.3-r1
index 824e07abc704..7818825614a5 100644
--- a/metadata/md5-cache/dev-games/physfs-2.0.3-r1
+++ b/metadata/md5-cache/dev-games/physfs-2.0.3-r1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=http://icculus.org/physfs/downloads/physfs-2.0.3.tar.bz2
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b001f8061834b5bce7c6fa97d42a14cc
diff --git a/metadata/md5-cache/dev-go/go-text-9999 b/metadata/md5-cache/dev-go/go-text-9999
index 74d45cbfd4e9..78f7b47e388b 100644
--- a/metadata/md5-cache/dev-go/go-text-9999
+++ b/metadata/md5-cache/dev-go/go-text-9999
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.4.2:= >=dev-lang/go-1.4.2
+DEPEND=>=dev-lang/go-1.4.2 >=dev-lang/go-1.4.2:=
 DESCRIPTION=Go text processing support
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/text
 LICENSE=BSD
 SLOT=0
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	golang-build	a952752689e79795c35761caf7b7c36f	golang-vcs	2abd744a5eac3f769df102ad2469035e	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=6d6e832d9d4713cde48ebc8cf19d0e3f
+_md5_=a27b02f57e7eb9b940732b367f8654a7
diff --git a/metadata/md5-cache/dev-go/go-tools-9999 b/metadata/md5-cache/dev-go/go-tools-9999
index 7528b2728207..945ae37b30a5 100644
--- a/metadata/md5-cache/dev-go/go-tools-9999
+++ b/metadata/md5-cache/dev-go/go-tools-9999
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install prepare test unpack
-DEPEND=>=dev-lang/go-1.4 dev-go/go-net >=dev-vcs/git-1.8.2.1
+DEPEND=dev-go/go-net >=dev-lang/go-1.4.2 >=dev-lang/go-1.4.2:=
 DESCRIPTION=Go Tools
 EAPI=5
 HOMEPAGE=https://godoc.org/golang.org/x/tools
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://golang.org/favicon.ico -> go-favicon.ico
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=6b823f5f29cae9afd11763f8d6b860ea
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	golang-build	a952752689e79795c35761caf7b7c36f	golang-vcs	2abd744a5eac3f769df102ad2469035e	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=c637b21bdff51bd1b7be1178e527e141
diff --git a/metadata/md5-cache/dev-java/batik-1.7-r3 b/metadata/md5-cache/dev-java/batik-1.7-r3
deleted file mode 100644
index 9f9d7f3f8f9c..000000000000
--- a/metadata/md5-cache/dev-java/batik-1.7-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 app-arch/unzip dev-java/xalan:0 dev-java/rhino:1.6 dev-java/xml-commons-external:1.3 python? ( dev-java/jython:0 ) tcl? ( dev-java/jacl:0 ) dev-java/ant-core >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java based SVG toolkit
-EAPI=4
-HOMEPAGE=http://xmlgraphics.apache.org/batik/
-IUSE=doc python tcl elibc_FreeBSD doc elibc_FreeBSD
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 dev-java/xalan:0 dev-java/rhino:1.6 dev-java/xml-commons-external:1.3 python? ( dev-java/jython:0 ) tcl? ( dev-java/jacl:0 ) dev-java/ant-core >=dev-java/java-config-2.2.0
-SLOT=1.7
-SRC_URI=mirror://apache/xmlgraphics/batik/batik-src-1.7.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=edb50a026908ebe4a3d41add9a37ce69
diff --git a/metadata/md5-cache/dev-java/batik-1.8 b/metadata/md5-cache/dev-java/batik-1.8-r1
similarity index 59%
rename from metadata/md5-cache/dev-java/batik-1.8
rename to metadata/md5-cache/dev-java/batik-1.8-r1
index 6fbb33f2b5dc..7f73337c8e1a 100644
--- a/metadata/md5-cache/dev-java/batik-1.8
+++ b/metadata/md5-cache/dev-java/batik-1.8-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/xalan:0 dev-java/rhino:1.6 dev-java/xml-commons-external:1.3 dev-java/xmlgraphics-commons:1.5 python? ( dev-java/jython:0 ) tcl? ( dev-java/jacl:0 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=virtual/jdk-1.6 dev-java/xalan:0 dev-java/rhino:1.6 dev-java/xml-commons-external:1.3 dev-java/xmlgraphics-commons:2 python? ( dev-java/jython:0 ) tcl? ( dev-java/jacl:0 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0 >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=Java based SVG toolkit
 EAPI=5
 HOMEPAGE=https://xmlgraphics.apache.org/batik/
 IUSE=doc python tcl elibc_FreeBSD doc elibc_FreeBSD
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.6 dev-java/xalan:0 dev-java/rhino:1.6 dev-java/xml-commons-external:1.3 dev-java/xmlgraphics-commons:1.5 python? ( dev-java/jython:0 ) tcl? ( dev-java/jacl:0 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0
+RDEPEND=>=virtual/jre-1.6 dev-java/xalan:0 dev-java/rhino:1.6 dev-java/xml-commons-external:1.3 dev-java/xmlgraphics-commons:2 python? ( dev-java/jython:0 ) tcl? ( dev-java/jacl:0 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0
 SLOT=1.8
 SRC_URI=http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/batik/source/batik-src-1.8.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fea119bb21ec5c93cf11472b51a364c9
+_md5_=ca2a0128928bfda685f0a8082ea91179
diff --git a/metadata/md5-cache/dev-java/fop-0.95 b/metadata/md5-cache/dev-java/fop-0.95
deleted file mode 100644
index f770595f4f21..000000000000
--- a/metadata/md5-cache/dev-java/fop-0.95
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 hyphenation? ( dev-java/offo-hyphenation ) app-arch/unzip dev-java/avalon-framework:4.2 dev-java/batik:1.7 dev-java/commons-io:1 dev-java/commons-logging:0 java-virtuals/servlet-api:2.2 dev-java/xmlgraphics-commons:1.3 dev-java/xml-commons-external:1.3 dev-java/xalan:0 jai? ( dev-java/sun-jai-bin ) jimi? ( dev-java/sun-jimi ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 dev-java/ant-trax >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Formatting Objects Processor is a print formatter driven by XSL
-EAPI=4
-HOMEPAGE=http://xmlgraphics.apache.org/fop/
-IUSE=hyphenation jai jimi elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 dev-java/avalon-framework:4.2 dev-java/batik:1.7 dev-java/commons-io:1 dev-java/commons-logging:0 java-virtuals/servlet-api:2.2 dev-java/xmlgraphics-commons:1.3 dev-java/xml-commons-external:1.3 dev-java/xalan:0 jai? ( dev-java/sun-jai-bin ) jimi? ( dev-java/sun-jimi ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-0.95-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3fdee9d8c1b28f3f79e2645a25587a2c
diff --git a/metadata/md5-cache/dev-java/fop-1.1 b/metadata/md5-cache/dev-java/fop-1.1
deleted file mode 100644
index b51f1400613c..000000000000
--- a/metadata/md5-cache/dev-java/fop-1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 dev-java/qdox:1.12 hyphenation? ( dev-java/offo-hyphenation ) app-arch/unzip dev-java/avalon-framework:4.2 dev-java/batik:1.7 dev-java/commons-io:1 dev-java/commons-logging:0 java-virtuals/servlet-api:2.2 dev-java/xmlgraphics-commons:1.5 dev-java/xml-commons-external:1.3 dev-java/ant-core:0 jai? ( dev-java/sun-jai-bin ) test? ( dev-java/junit:4 dev-java/xmlunit ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 dev-java/ant-trax >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Formatting Objects Processor is a print formatter driven by XSL
-EAPI=5
-HOMEPAGE=http://xmlgraphics.apache.org/fop/
-IUSE=hyphenation jai elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 dev-java/avalon-framework:4.2 dev-java/batik:1.7 dev-java/commons-io:1 dev-java/commons-logging:0 java-virtuals/servlet-api:2.2 dev-java/xmlgraphics-commons:1.5 dev-java/xml-commons-external:1.3 dev-java/ant-core:0 jai? ( dev-java/sun-jai-bin ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-1.1-src.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=acefd3315995e230c04d6100f6dbb31c
diff --git a/metadata/md5-cache/dev-java/fop-2.0 b/metadata/md5-cache/dev-java/fop-2.0
new file mode 100644
index 000000000000..225783b0b109
--- /dev/null
+++ b/metadata/md5-cache/dev-java/fop-2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.6 dev-java/qdox:1.12 hyphenation? ( dev-java/offo-hyphenation:0 ) app-arch/unzip dev-java/batik:1.8 dev-java/ant-core:0 dev-java/fontbox:1.7 dev-java/commons-io:1 dev-java/commons-logging:0 java-virtuals/servlet-api:3.0 dev-java/avalon-framework:4.2 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 jai? ( dev-java/sun-jai-bin:0 ) test? ( dev-java/ant-junit:0 dev-java/junit:4 dev-java/xmlunit:1 dev-java/mockito:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Formatting Objects Processor is a print formatter driven by XSL
+EAPI=5
+HOMEPAGE=http://xmlgraphics.apache.org/fop/
+IUSE=hyphenation jai elibc_FreeBSD doc examples source test elibc_FreeBSD
+KEYWORDS=amd64 x86 ~ppc ~ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.6 dev-java/batik:1.8 dev-java/ant-core:0 dev-java/fontbox:1.7 dev-java/commons-io:1 dev-java/commons-logging:0 java-virtuals/servlet-api:3.0 dev-java/avalon-framework:4.2 dev-java/xmlgraphics-commons:2 dev-java/xml-commons-external:1.3 jai? ( dev-java/sun-jai-bin:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=2
+SRC_URI=mirror://apache/xmlgraphics/fop/source/fop-2.0-src.zip
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=e8d8e3783eb2047cbc552186379f12cf
diff --git a/metadata/md5-cache/dev-java/jcharts-0.7.5-r2 b/metadata/md5-cache/dev-java/jcharts-0.7.5-r3
similarity index 62%
rename from metadata/md5-cache/dev-java/jcharts-0.7.5-r2
rename to metadata/md5-cache/dev-java/jcharts-0.7.5-r3
index 5d81daac6483..a19c44acdcc5 100644
--- a/metadata/md5-cache/dev-java/jcharts-0.7.5-r2
+++ b/metadata/md5-cache/dev-java/jcharts-0.7.5-r3
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/batik:1.7 java-virtuals/servlet-api:3.0 || ( virtual/jdk:1.6 virtual/jdk:1.5 virtual/jdk:1.4 ) app-arch/unzip >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=dev-java/batik:1.8 java-virtuals/servlet-api:3.0 || ( virtual/jdk:1.6 virtual/jdk:1.5 virtual/jdk:1.4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=jCharts is a 100% Java based charting utility that outputs a variety of charts
-EAPI=4
+EAPI=5
 HOMEPAGE=http://jcharts.sourceforge.net/
 IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=dev-java/batik:1.7 java-virtuals/servlet-api:3.0 || ( virtual/jre:1.6 virtual/jre:1.5 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RDEPEND=dev-java/batik:1.8 java-virtuals/servlet-api:3.0 || ( virtual/jre:1.6 virtual/jre:1.5 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/jcharts/jCharts-0.7.5.zip
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=383253f614a6ad1e19ba28b1d598b87e
+_md5_=5d1235482a1be4c1ba24dde5bb9bcd60
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.0 b/metadata/md5-cache/dev-java/jflex-1.6.0
index 3fc2e17ba69a..c31073a33b07 100644
--- a/metadata/md5-cache/dev-java/jflex-1.6.0
+++ b/metadata/md5-cache/dev-java/jflex-1.6.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 dev-java/junit:0 >=dev-java/javacup-0.11a_beta20060608:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=virtual/jdk-1.5 dev-java/ant-core:0 >=dev-java/javacup-0.11a_beta20060608:0 dev-java/junit:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=JFlex is a lexical analyzer generator for Java
 EAPI=5
 HOMEPAGE=http://www.jflex.de/
 IUSE=doc source examples source vim-syntax elibc_FreeBSD doc source examples elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~ppc ppc64 x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
-RDEPEND=>=virtual/jre-1.5 vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) >=dev-java/ant-core-1.7.0 >=dev-java/javacup-0.11a_beta20060608:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RDEPEND=>=virtual/jre-1.5 vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) dev-java/ant-core:0 >=dev-java/javacup-0.11a_beta20060608:0 dev-java/junit:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=1.6
 SRC_URI=http://jflex.de/jflex-1.6.0.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=d656e5de898a3a8a970905359067d1ef
+_md5_=1d70cfdae9f057ec9f0e0ff851add58d
diff --git a/metadata/md5-cache/dev-java/jython-2.7.0 b/metadata/md5-cache/dev-java/jython-2.7.0
index bcd932e78854..cf90012b853f 100644
--- a/metadata/md5-cache/dev-java/jython-2.7.0
+++ b/metadata/md5-cache/dev-java/jython-2.7.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/ant-core:0 dev-java/antlr:3 dev-java/netty-transport:0 =dev-java/asm-5.0.3:4 dev-java/commons-compress:0 dev-java/guava:13 >=dev-java/java-config-2.1.11-r3 dev-java/jffi:1.2 dev-java/jline:0 dev-java/jline:2 dev-java/icu4j:52 dev-java/jnr-constants:0 dev-java/jnr-posix:3.0 dev-java/jnr-netdb:1.0 dev-java/stringtemplate:0 dev-java/xerces:2 java-virtuals/script-api:0 java-virtuals/servlet-api:3.0 readline? ( >=dev-java/libreadline-java-0.8.0:0 ) >=virtual/jdk-1.7 app-arch/unzip test? ( dev-java/junit:4 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=dev-java/ant-core:0 dev-java/antlr:3 dev-java/netty-transport:0 =dev-java/asm-5.0.3:4 dev-java/commons-compress:0 dev-java/guava:13 >=dev-java/java-config-2.1.11-r3 dev-java/jffi:1.2 dev-java/jline:2 dev-java/icu4j:52 dev-java/jnr-constants:0 dev-java/jnr-posix:3.0 dev-java/jnr-netdb:1.0 dev-java/stringtemplate:0 dev-java/xerces:2 java-virtuals/script-api:0 java-virtuals/servlet-api:3.0 readline? ( >=dev-java/libreadline-java-0.8.0:0 ) >=virtual/jdk-1.7 app-arch/unzip test? ( dev-java/junit:4 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=An implementation of Python written in Java
 EAPI=5
 HOMEPAGE=http://www.jython.org
 IUSE=+readline test elibc_FreeBSD doc examples source elibc_FreeBSD
 KEYWORDS=~amd64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=PSF-2
-RDEPEND=dev-java/ant-core:0 dev-java/antlr:3 dev-java/netty-transport:0 =dev-java/asm-5.0.3:4 dev-java/commons-compress:0 dev-java/guava:13 >=dev-java/java-config-2.1.11-r3 dev-java/jffi:1.2 dev-java/jline:0 dev-java/jline:2 dev-java/icu4j:52 dev-java/jnr-constants:0 dev-java/jnr-posix:3.0 dev-java/jnr-netdb:1.0 dev-java/stringtemplate:0 dev-java/xerces:2 java-virtuals/script-api:0 java-virtuals/servlet-api:3.0 readline? ( >=dev-java/libreadline-java-0.8.0:0 ) >=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+RDEPEND=dev-java/ant-core:0 dev-java/antlr:3 dev-java/netty-transport:0 =dev-java/asm-5.0.3:4 dev-java/commons-compress:0 dev-java/guava:13 >=dev-java/java-config-2.1.11-r3 dev-java/jffi:1.2 dev-java/jline:2 dev-java/icu4j:52 dev-java/jnr-constants:0 dev-java/jnr-posix:3.0 dev-java/jnr-netdb:1.0 dev-java/stringtemplate:0 dev-java/xerces:2 java-virtuals/script-api:0 java-virtuals/servlet-api:3.0 readline? ( >=dev-java/libreadline-java-0.8.0:0 ) >=virtual/jre-1.7 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 REQUIRED_USE=test? ( readline )
 RESTRICT=test
 SLOT=2.7
 SRC_URI=http://search.maven.org/remotecontent?filepath=org/python/jython/2.7.0/jython-2.7.0-sources.jar
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f0ce5038e6eddf421bc3be6bb734c8fb
+_md5_=001ea69eb3291341f51734474f8a80e7
diff --git a/metadata/md5-cache/dev-java/mockito-1.9.5-r1 b/metadata/md5-cache/dev-java/mockito-1.9.5-r1
index 98428dab0d02..e490d1d54a83 100644
--- a/metadata/md5-cache/dev-java/mockito-1.9.5-r1
+++ b/metadata/md5-cache/dev-java/mockito-1.9.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A mocking framework for Java
 EAPI=5
 HOMEPAGE=https://code.google.com/p/mockito/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~ppc ~ppc64
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.5 dev-java/junit:4 dev-java/objenesis:0 dev-java/hamcrest-core:0 dev-java/ant-core:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://mockito.googlecode.com/files/mockito-1.9.5.zip
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9cca9e39701eeb92951e7e976c60cb0d
+_md5_=3b3ea787026d3a7e7449cc4ca06502da
diff --git a/metadata/md5-cache/dev-java/objenesis-1.3 b/metadata/md5-cache/dev-java/objenesis-1.3
index 447afdbac074..ecd582f708ff 100644
--- a/metadata/md5-cache/dev-java/objenesis-1.3
+++ b/metadata/md5-cache/dev-java/objenesis-1.3
@@ -4,10 +4,10 @@ DESCRIPTION=A small Java library with one purpose: To instantiate a new object o
 EAPI=5
 HOMEPAGE=http://objenesis.googlecode.com/
 IUSE=elibc_FreeBSD source doc elibc_FreeBSD
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 x86 ~ppc ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=http://objenesis.googlecode.com/files/objenesis-1.3-bin.zip
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-pkg-simple	28dc6c3e6fa8ed51b88360dfd5fee53e	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=aab091e35b69e5d606a9d1937c038dcf
+_md5_=4cacf703d51887d7407ebbb6f3d96686
diff --git a/metadata/md5-cache/dev-java/wstx-3.2.9 b/metadata/md5-cache/dev-java/wstx-3.2.9
index bee2f01f3de2..371e6346ae99 100644
--- a/metadata/md5-cache/dev-java/wstx-3.2.9
+++ b/metadata/md5-cache/dev-java/wstx-3.2.9
@@ -4,10 +4,10 @@ DESCRIPTION=Woodstox is a high-performance validating namespace-aware XML-proces
 EAPI=5
 HOMEPAGE=http://woodstox.codehaus.org/
 IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.4 dev-java/emma:0 dev-java/sax:0 java-virtuals/jaxp-virtual dev-java/stax:0 dev-java/msv:0 dev-java/xsdlib:0 dev-java/relaxng-datatype:0 dev-java/junit:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
 SLOT=3.2
 SRC_URI=http://woodstox.codehaus.org/3.2.9/wstx-src-3.2.9.zip
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=79aefeb8b0f150b662d78ed8d40a13d6
+_md5_=6546c4973ca1bc6052ccae208ccb5a7f
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-1.2-r1 b/metadata/md5-cache/dev-java/xmlgraphics-commons-1.2-r1
deleted file mode 100644
index 1787570b0825..000000000000
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-1.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup test unpack
-DEPEND=|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* ) jpeg? ( || ( >=dev-java/blackdown-jdk-1.4 =dev-java/icedtea-bin-1* >=dev-java/ibm-jdk-bin-1.4 >=dev-java/jrockit-jdk-bin-1.4 dev-java/icedtea >=dev-java/apple-jdk-bin-1.4 ) ) test? ( dev-java/ant-junit ) >=dev-java/commons-io-1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A library of several reusable components used by Apache Batik and Apache FOP
-HOMEPAGE=http://xmlgraphics.apache.org/commons/index.html
-IUSE=jpeg elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 >=dev-java/commons-io-1 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1
-SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-1.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6fe0ac0c4129e72c2ac45881b61fe55a
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-1.3.1 b/metadata/md5-cache/dev-java/xmlgraphics-commons-1.3.1
deleted file mode 100644
index c8af42d979ac..000000000000
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-1.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install preinst setup test unpack
-DEPEND=|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* ) test? ( dev-java/ant-junit ) dev-java/commons-io:1 >=dev-java/commons-logging-1:0 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=sys-apps/portage-2.1.2.7 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=A library of several reusable components used by Apache Batik and Apache FOP
-EAPI=1
-HOMEPAGE=http://xmlgraphics.apache.org/commons/index.html
-IUSE=jpeg elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 dev-java/commons-io:1 >=dev-java/commons-logging-1:0 >=dev-java/java-config-2.2.0 >=sys-apps/portage-2.1.2.7 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.3
-SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-1.3.1-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=501607ad51c3617074394acd04eb4025
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-1.5 b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.0.1
similarity index 60%
rename from metadata/md5-cache/dev-java/xmlgraphics-commons-1.5
rename to metadata/md5-cache/dev-java/xmlgraphics-commons-2.0.1
index e794d3f919fd..716c23b65b78 100644
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-1.5
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.0.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 test? ( dev-java/ant-junit4 ) dev-java/commons-io:1 >=dev-java/commons-logging-1:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=virtual/jdk-1.6 test? ( dev-java/mockito:0 dev-java/ant-junit:0 dev-java/xml-commons-resolver:0 ) dev-java/commons-io:1 >=dev-java/commons-logging-1:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=A library of several reusable components used by Apache Batik and Apache FOP
 EAPI=5
 HOMEPAGE=http://xmlgraphics.apache.org/commons/index.html
 IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=amd64 x86 ~ppc ~ppc64
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 dev-java/commons-io:1 >=dev-java/commons-logging-1:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=1.5
-SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-1.5-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c7eda40b55c1539a8aea17a588f0e090
+RDEPEND=>=virtual/jre-1.6 dev-java/commons-io:1 >=dev-java/commons-logging-1:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+SLOT=2
+SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-2.0.1-src.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=3c462a612be6666b71daac2b6510fb58
diff --git a/metadata/md5-cache/dev-java/xmlunit-1.6 b/metadata/md5-cache/dev-java/xmlunit-1.6
new file mode 100644
index 000000000000..943a8a072461
--- /dev/null
+++ b/metadata/md5-cache/dev-java/xmlunit-1.6
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.6 app-arch/unzip:0 doc? ( app-text/docbook-xsl-stylesheets:0 ) test? ( dev-java/ant-junit:0 dev-java/ant-trax:0 ) dev-java/junit:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=XMLUnit extends JUnit and NUnit to enable unit testing of XML
+EAPI=5
+HOMEPAGE=http://xmlunit.sourceforge.net/
+IUSE=elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.6 dev-java/junit:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+SLOT=1
+SRC_URI=mirror://sourceforge/xmlunit/xmlunit-1.6-src.zip
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=63e7f6bbaff556b82b13f47ca4831dc0
diff --git a/metadata/md5-cache/dev-lang/lua-5.1.5-r100 b/metadata/md5-cache/dev-lang/lua-5.1.5-r100
index b8ad6274a8f8..f812d18d18c5 100644
--- a/metadata/md5-cache/dev-lang/lua-5.1.5-r100
+++ b/metadata/md5-cache/dev-lang/lua-5.1.5-r100
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( >=sys-libs/readline-6.2_p5-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(-)?] ) app-eselect/eselect-lua !dev-lang/lua:0
 SLOT=5.1
 SRC_URI=http://www.lua.org/ftp/lua-5.1.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=26d3be52c79181eb797b8334af4f0134
diff --git a/metadata/md5-cache/dev-lang/lua-5.1.5-r3 b/metadata/md5-cache/dev-lang/lua-5.1.5-r3
index 1d974cfda73c..fd8fbf23b7f9 100644
--- a/metadata/md5-cache/dev-lang/lua-5.1.5-r3
+++ b/metadata/md5-cache/dev-lang/lua-5.1.5-r3
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( >=sys-libs/readline-6.2_p5-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
 SRC_URI=http://www.lua.org/ftp/lua-5.1.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=61c7417e7af0266b06e7121db7215ef9
diff --git a/metadata/md5-cache/dev-lang/lua-5.2.3-r1 b/metadata/md5-cache/dev-lang/lua-5.2.3-r1
index 4c90228d7114..b6c1bb088cbc 100644
--- a/metadata/md5-cache/dev-lang/lua-5.2.3-r1
+++ b/metadata/md5-cache/dev-lang/lua-5.2.3-r1
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/lua-mode )
 RDEPEND=readline? ( sys-libs/readline ) app-eselect/eselect-lua !dev-lang/lua:0
 SLOT=5.2
 SRC_URI=http://www.lua.org/ftp/lua-5.2.3.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=85fc2a53cdb09da6893c24f5502fc815
diff --git a/metadata/md5-cache/dev-lang/luajit-2.0.3-r1 b/metadata/md5-cache/dev-lang/luajit-2.0.3-r1
index 23a81e429de5..effc74516ca3 100644
--- a/metadata/md5-cache/dev-lang/luajit-2.0.3-r1
+++ b/metadata/md5-cache/dev-lang/luajit-2.0.3-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Just-In-Time Compiler for the Lua programming language
 EAPI=5
 HOMEPAGE=http://luajit.org/
 IUSE=lua52compat
-KEYWORDS=~amd64 arm ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=2
 SRC_URI=http://luajit.org/download/LuaJIT-2.0.3.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0669ab85804caec5074c325bd8ee2770
+_md5_=d8f10b1f840db07a184fff6717c5050f
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.19 b/metadata/md5-cache/dev-lang/orc-0.4.19
index 6690b5071cb6..05c2eb0744a3 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.19
+++ b/metadata/md5-cache/dev-lang/orc-0.4.19
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm hppa ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~p
 LICENSE=BSD BSD-2
 SLOT=0
 SRC_URI=http://gstreamer.freedesktop.org/src/orc/orc-0.4.19.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=83a92e0a60cf65840d10912319b7f782
diff --git a/metadata/md5-cache/dev-lang/orc-0.4.23 b/metadata/md5-cache/dev-lang/orc-0.4.23
index 26f8bb5077f2..114fdf6b7c71 100644
--- a/metadata/md5-cache/dev-lang/orc-0.4.23
+++ b/metadata/md5-cache/dev-lang/orc-0.4.23
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm hppa ppc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~p
 LICENSE=BSD BSD-2
 SLOT=0
 SRC_URI=http://gstreamer.freedesktop.org/src/orc/orc-0.4.23.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=681deb3e6ee07e2c5db6662f957a89fc
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.3.1 b/metadata/md5-cache/dev-lang/swi-prolog-7.2.2
similarity index 89%
rename from metadata/md5-cache/dev-lang/swi-prolog-7.3.1
rename to metadata/md5-cache/dev-lang/swi-prolog-7.2.2
index 575d739d6ecf..6a2ec4257dec 100644
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.3.1
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.2.2
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=LGPL-2.1
 RDEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.5 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.3.1.tar.gz mirror://gentoo/swi-prolog-7.3.1-gentoo-patchset-0.tar.gz
+SRC_URI=http://www.swi-prolog.org/download/stable/src/swipl-7.2.2.tar.gz mirror://gentoo/swi-prolog-7.2.2-gentoo-patchset-0.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ea9b63b8510b0ab9da7f6d508597ea8c
+_md5_=122a0a257593f6291b56b477cc5ebb80
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.3.0 b/metadata/md5-cache/dev-lang/swi-prolog-7.3.0
deleted file mode 100644
index 5d856db415ac..000000000000
--- a/metadata/md5-cache/dev-lang/swi-prolog-7.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.5 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-proto/xproto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.2.0 )
-DESCRIPTION=free, small, and standard compliant Prolog compiler
-EAPI=4
-HOMEPAGE=http://www.swi-prolog.org/
-IUSE=archive debug doc +gmp hardened java minimal odbc +readline ssl static-libs test zlib X elibc_FreeBSD java
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=LGPL-2.1
-RDEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.5 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0 )
-SLOT=0
-SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.3.0.tar.gz mirror://gentoo/swi-prolog-7.3.0-gentoo-patchset-0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=86414d75649b9f96146a9e863d36aca6
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.15-r1 b/metadata/md5-cache/dev-lang/tcl-8.5.15-r1
index 6de856963f2f..8cafaf4b802b 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.5.15-r1
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.15-r1
@@ -9,5 +9,5 @@ LICENSE=tcltk
 RDEPEND=>=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(-)?]
 SLOT=0
 SRC_URI=mirror://sourceforge/tcl/tcl8.5.15-src.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bc2340679d91126f94c5272c57f92f7a
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.17 b/metadata/md5-cache/dev-lang/tcl-8.5.17
index 40563758939b..26407a3494d0 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.5.17
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.17
@@ -9,5 +9,5 @@ LICENSE=tcltk
 RDEPEND=>=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(-)?]
 SLOT=0/8.5
 SRC_URI=mirror://sourceforge/tcl/tcl8.5.17-src.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cc8bbf4429c325e36f781a102e6bf03c
diff --git a/metadata/md5-cache/dev-lang/tcl-8.5.17-r100 b/metadata/md5-cache/dev-lang/tcl-8.5.17-r100
index 8f6acf638929..7c00205a25c2 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.5.17-r100
+++ b/metadata/md5-cache/dev-lang/tcl-8.5.17-r100
@@ -9,5 +9,5 @@ LICENSE=tcltk
 RDEPEND=>=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(-)?] !=dev-lang/tcl-8.5*:0
 SLOT=8.5
 SRC_URI=mirror://sourceforge/tcl/tcl8.5.17-src.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=32d59e5c9d1d268273c5697a832e912f
diff --git a/metadata/md5-cache/dev-lang/tcl-8.6.3 b/metadata/md5-cache/dev-lang/tcl-8.6.3
index c2b2381321cf..033c769ae963 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.6.3
+++ b/metadata/md5-cache/dev-lang/tcl-8.6.3
@@ -9,5 +9,5 @@ LICENSE=tcltk
 RDEPEND=>=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(-)?]
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tcl-core8.6.3-src.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fd40fd4c7f754bb44069a01737323b7c
diff --git a/metadata/md5-cache/dev-lang/tcl-8.6.4 b/metadata/md5-cache/dev-lang/tcl-8.6.4
index 79355ec23e37..e63b12a9f92e 100644
--- a/metadata/md5-cache/dev-lang/tcl-8.6.4
+++ b/metadata/md5-cache/dev-lang/tcl-8.6.4
@@ -9,5 +9,5 @@ LICENSE=tcltk
 RDEPEND=>=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(-)?]
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tcl-core8.6.4-src.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=018344b1cb4aa8d34b1ea112c2fee98d
diff --git a/metadata/md5-cache/dev-lang/tk-8.6.4-r1 b/metadata/md5-cache/dev-lang/tk-8.6.4-r1
index f0d8a3329397..764508fc3147 100644
--- a/metadata/md5-cache/dev-lang/tk-8.6.4-r1
+++ b/metadata/md5-cache/dev-lang/tk-8.6.4-r1
@@ -9,5 +9,5 @@ LICENSE=tcltk
 RDEPEND=!aqua? ( >=media-libs/fontconfig-2.10.92[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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXt-1.1.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(-)?] truetype? ( >=x11-libs/libXft-2.3.1-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(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-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(-)?] ) ) ~dev-lang/tcl-8.6.4: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(-)?]
 SLOT=0/8.6
 SRC_URI=mirror://sourceforge/tcl/tk8.6.4-src.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=ebebf52bdea884ea56048bea7cc7d0ea
diff --git a/metadata/md5-cache/dev-libs/angelscript-2.29.2 b/metadata/md5-cache/dev-libs/angelscript-2.29.2
index 64d0dee6023c..20c4db74a737 100644
--- a/metadata/md5-cache/dev-libs/angelscript-2.29.2
+++ b/metadata/md5-cache/dev-libs/angelscript-2.29.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=ZLIB
 SLOT=0
 SRC_URI=http://www.angelcode.com/angelscript/sdk/files/angelscript_2.29.2.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a76c22c0fc9e925dae017d3bf1bc05d0
diff --git a/metadata/md5-cache/dev-libs/atk-2.12.0-r1 b/metadata/md5-cache/dev-libs/atk-2.12.0-r1
index b3e55d11b97b..61e55032b2bf 100644
--- a/metadata/md5-cache/dev-libs/atk-2.12.0-r1
+++ b/metadata/md5-cache/dev-libs/atk-2.12.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20140508 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/atk/2.12/atk-2.12.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a0fdc0efa45029538a9af4159121efee
diff --git a/metadata/md5-cache/dev-libs/atk-2.14.0 b/metadata/md5-cache/dev-libs/atk-2.14.0
index 80433018b1ce..ead76bbb381a 100644
--- a/metadata/md5-cache/dev-libs/atk-2.14.0
+++ b/metadata/md5-cache/dev-libs/atk-2.14.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20140508 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/atk/2.14/atk-2.14.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bfd297af8f275bd8cc5eeb17cae94496
diff --git a/metadata/md5-cache/dev-libs/atk-2.16.0 b/metadata/md5-cache/dev-libs/atk-2.16.0
index 1877323363d4..02160a709b3b 100644
--- a/metadata/md5-cache/dev-libs/atk-2.16.0
+++ b/metadata/md5-cache/dev-libs/atk-2.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20140508 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/atk/2.16/atk-2.16.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b023894a5b6c1ddf65dc248966e1ffa1
diff --git a/metadata/md5-cache/dev-libs/boost-1.55.0-r2 b/metadata/md5-cache/dev-libs/boost-1.55.0-r2
index 51e66197810f..441946e17c42 100644
--- a/metadata/md5-cache/dev-libs/boost-1.55.0-r2
+++ b/metadata/md5-cache/dev-libs/boost-1.55.0-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=mpi? ( threads ) python? ( || ( python_targets_python2_7 python_tar
 RESTRICT=test
 SLOT=0/1.55.0
 SRC_URI=mirror://sourceforge/boost/boost_1_55_0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a1803e96a9fc399af11951c9ac7ec06c
diff --git a/metadata/md5-cache/dev-libs/boost-1.56.0-r1 b/metadata/md5-cache/dev-libs/boost-1.56.0-r1
index 11b3b65bfd3d..35829447c354 100644
--- a/metadata/md5-cache/dev-libs/boost-1.56.0-r1
+++ b/metadata/md5-cache/dev-libs/boost-1.56.0-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=mpi? ( threads ) python? ( || ( python_targets_python2_7 python_tar
 RESTRICT=test
 SLOT=0/1.56.0
 SRC_URI=mirror://sourceforge/boost/boost_1_56_0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=684002501bb102d38ded9b6969a4cfe2
diff --git a/metadata/md5-cache/dev-libs/boost-1.57.0 b/metadata/md5-cache/dev-libs/boost-1.57.0
index 5d745017cf56..46fd2a7bcc21 100644
--- a/metadata/md5-cache/dev-libs/boost-1.57.0
+++ b/metadata/md5-cache/dev-libs/boost-1.57.0
@@ -11,5 +11,5 @@ REQUIRED_USE=mpi? ( threads ) python? ( || ( python_targets_python2_7 python_tar
 RESTRICT=test
 SLOT=0/1.57.0
 SRC_URI=mirror://sourceforge/boost/boost_1_57_0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d66f957fa3d6f0b22d5d4c72f4b34ce4
diff --git a/metadata/md5-cache/dev-libs/check-0.9.11 b/metadata/md5-cache/dev-libs/check-0.9.11
index 102a8aa71e5e..0fefd8fe5b20 100644
--- a/metadata/md5-cache/dev-libs/check-0.9.11
+++ b/metadata/md5-cache/dev-libs/check-0.9.11
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=subunit? ( dev-python/subunit )
 SLOT=0
 SRC_URI=mirror://sourceforge/check/check-0.9.11.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0e0f8d71f821d021f861fe9df0053f88
diff --git a/metadata/md5-cache/dev-libs/check-0.9.12 b/metadata/md5-cache/dev-libs/check-0.9.12
index f19393ac33b0..f7be12b1055e 100644
--- a/metadata/md5-cache/dev-libs/check-0.9.12
+++ b/metadata/md5-cache/dev-libs/check-0.9.12
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=subunit? ( dev-python/subunit )
 SLOT=0
 SRC_URI=mirror://sourceforge/check/check-0.9.12.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ec0c3390dceb4d98441ac5a94ffa2197
diff --git a/metadata/md5-cache/dev-libs/check-0.9.13 b/metadata/md5-cache/dev-libs/check-0.9.13
index 2b0ee5e80628..b1544598f006 100644
--- a/metadata/md5-cache/dev-libs/check-0.9.13
+++ b/metadata/md5-cache/dev-libs/check-0.9.13
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=subunit? ( dev-python/subunit )
 SLOT=0
 SRC_URI=mirror://sourceforge/check/check-0.9.13.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=cd59c6161edccced83bfa3734dd0d6a4
diff --git a/metadata/md5-cache/dev-libs/check-0.9.13-r1 b/metadata/md5-cache/dev-libs/check-0.9.13-r1
index c1843b08c372..7151d7d7d0e2 100644
--- a/metadata/md5-cache/dev-libs/check-0.9.13-r1
+++ b/metadata/md5-cache/dev-libs/check-0.9.13-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=subunit? ( >=dev-python/subunit-0.0.10-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
 SRC_URI=mirror://sourceforge/check/check-0.9.13.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=3f53428e8e2981d6d5a5aa5874bdb4d6
diff --git a/metadata/md5-cache/dev-libs/cloog-0.18.1 b/metadata/md5-cache/dev-libs/cloog-0.18.1
index 92b21759165d..b2c0b26a33eb 100644
--- a/metadata/md5-cache/dev-libs/cloog-0.18.1
+++ b/metadata/md5-cache/dev-libs/cloog-0.18.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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(-)?] >=dev-libs/isl-0.12.2:0/10[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(-)?] !dev-libs/cloog-ppl
 SLOT=0/4
 SRC_URI=http://www.bastoul.net/cloog/pages/download/cloog-0.18.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6e200c9578f31f5a630a1328af342fcd
diff --git a/metadata/md5-cache/dev-libs/cloog-0.18.3 b/metadata/md5-cache/dev-libs/cloog-0.18.3
index c28a975082bd..e25da375fd08 100644
--- a/metadata/md5-cache/dev-libs/cloog-0.18.3
+++ b/metadata/md5-cache/dev-libs/cloog-0.18.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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(-)?] >=dev-libs/isl-0.14:0/14[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(-)?] !dev-libs/cloog-ppl
 SLOT=0/4
 SRC_URI=http://www.bastoul.net/cloog/pages/download/cloog-0.18.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0dd889a2f52180f1f7cce9c78c4f07df
diff --git a/metadata/md5-cache/dev-libs/cloog-9999 b/metadata/md5-cache/dev-libs/cloog-9999
index aaa91c67ffe1..88d0dc4ad048 100644
--- a/metadata/md5-cache/dev-libs/cloog-9999
+++ b/metadata/md5-cache/dev-libs/cloog-9999
@@ -7,5 +7,5 @@ IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi
 LICENSE=LGPL-2.1
 RDEPEND=>=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(-)?] >=dev-libs/isl-0.14:0/14[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(-)?] !dev-libs/cloog-ppl
 SLOT=0/4
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6ccb563190f470eb3dfde7e5f23b7f9b
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9
index 0d283b6ef7de..2c5d758be183 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r9
@@ -9,5 +9,5 @@ LICENSE=BSD-with-attribution
 RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-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? ( >=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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) mysql? ( virtual/mysql ) pam? ( >=virtual/pam-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(-)?] ) postgres? ( dev-db/postgresql:= ) sqlite? ( >=dev-db/sqlite-3.8.2:3[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(-)?] ) ssl? ( >=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(-)?] ) java? ( >=virtual/jdk-1.4:= ) selinux? ( sec-policy/selinux-sasl ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=2
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f2b0be0ccaecdbfb92f9c96a44af5e18
diff --git a/metadata/md5-cache/dev-libs/dbus-c++-0.9.0-r2 b/metadata/md5-cache/dev-libs/dbus-c++-0.9.0-r2
index 277b752b5172..17f53840958b 100644
--- a/metadata/md5-cache/dev-libs/dbus-c++-0.9.0-r2
+++ b/metadata/md5-cache/dev-libs/dbus-c++-0.9.0-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=sys-apps/dbus[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(-)?] ecore? ( dev-libs/ecore ) glib? ( dev-libs/glib:2[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
 SRC_URI=mirror://sourceforge/dbus-cplusplus/libdbus-c++-0.9.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b46aa274ed6345b5dbcd4283baebc092
diff --git a/metadata/md5-cache/dev-libs/dbus-glib-0.102 b/metadata/md5-cache/dev-libs/dbus-glib-0.102
index b96eb237868b..14f9eb289056 100644
--- a/metadata/md5-cache/dev-libs/dbus-glib-0.102
+++ b/metadata/md5-cache/dev-libs/dbus-glib-0.102
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 AFL-2.1 )
 RDEPEND=>=dev-libs/expat-2.1.0-r3[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(-)?] >=dev-libs/glib-2.34.3:2[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(-)?] >=sys-apps/dbus-1.6.18-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(-)?] abi_x86_32? ( !<app-emulation/emul-linux-x86-baselibs-20131008-r8 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.102.tar.gz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=01c29d4beb95f9b9f7b04b0988174c4f
diff --git a/metadata/md5-cache/dev-libs/ding-libs-0.4.0 b/metadata/md5-cache/dev-libs/ding-libs-0.4.0
index 89873d30b2a2..54f02fff4a0f 100644
--- a/metadata/md5-cache/dev-libs/ding-libs-0.4.0
+++ b/metadata/md5-cache/dev-libs/ding-libs-0.4.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 x86 ~amd64-linux
 LICENSE=LGPL-3 GPL-3
 SLOT=0
 SRC_URI=https://fedorahosted.org/released/ding-libs/ding-libs-0.4.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=fa560954be8d48730d48c4edd768588e
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.155-r1 b/metadata/md5-cache/dev-libs/elfutils-0.155-r1
index e3da1f5d12e6..120e90e7fc69 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.155-r1
+++ b/metadata/md5-cache/dev-libs/elfutils-0.155-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-exceptions
 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(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) !dev-libs/libelf abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r11 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/e/l/elfutils/0.155/elfutils-0.155.tar.bz2 https://fedorahosted.org/releases/e/l/elfutils/0.155/elfutils-portability.patch -> elfutils-0.155-portability.patch https://fedorahosted.org/releases/e/l/elfutils/0.155/elfutils-robustify.patch -> elfutils-0.155-robustify.patch
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7b2a1aa6ee93b3911afeacade35f4d3b
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.156 b/metadata/md5-cache/dev-libs/elfutils-0.156
index b67a040f9dba..c7c52fa70e05 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.156
+++ b/metadata/md5-cache/dev-libs/elfutils-0.156
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-exceptions
 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(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) !dev-libs/libelf abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r11 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/e/l/elfutils/0.156/elfutils-0.156.tar.bz2 https://fedorahosted.org/releases/e/l/elfutils/0.156/elfutils-portability.patch -> elfutils-0.156-portability.patch https://fedorahosted.org/releases/e/l/elfutils/0.156/elfutils-robustify.patch -> elfutils-0.156-robustify.patch
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=daa50cc693defb0307cc62670fa9a8c8
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.157 b/metadata/md5-cache/dev-libs/elfutils-0.157
index 8ff90fa8a533..cf8e64396805 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.157
+++ b/metadata/md5-cache/dev-libs/elfutils-0.157
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-exceptions
 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(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) !dev-libs/libelf abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r11 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/e/l/elfutils/0.157/elfutils-0.157.tar.bz2 https://fedorahosted.org/releases/e/l/elfutils/0.157/elfutils-portability.patch -> elfutils-0.157-portability.patch https://fedorahosted.org/releases/e/l/elfutils/0.157/elfutils-robustify.patch -> elfutils-0.157-robustify.patch
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d6ad6fc958b7cbc7cdc4aa459139b79d
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.158 b/metadata/md5-cache/dev-libs/elfutils-0.158
index 2f0a3ca4f815..0a3d77b01942 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.158
+++ b/metadata/md5-cache/dev-libs/elfutils-0.158
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-exceptions
 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(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) !dev-libs/libelf abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r11 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/e/l/elfutils/0.158/elfutils-0.158.tar.bz2 https://fedorahosted.org/releases/e/l/elfutils/0.158/elfutils-portability.patch -> elfutils-0.158-portability.patch https://fedorahosted.org/releases/e/l/elfutils/0.158/elfutils-robustify.patch -> elfutils-0.158-robustify.patch
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=124077103ebfa0e6ec3a146a71a197ab
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.159 b/metadata/md5-cache/dev-libs/elfutils-0.159
index 8c2a1ceea775..56745b9390e8 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.159
+++ b/metadata/md5-cache/dev-libs/elfutils-0.159
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-exceptions
 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(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) !dev-libs/libelf abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r11 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/e/l/elfutils/0.159/elfutils-0.159.tar.bz2 https://fedorahosted.org/releases/e/l/elfutils/0.159/elfutils-portability.patch -> elfutils-0.159-portability.patch
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=deb542c73eeda460b8141fc38b63fdd3
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.160 b/metadata/md5-cache/dev-libs/elfutils-0.160
index dd21aa28eb9d..8cbefe5374f5 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.160
+++ b/metadata/md5-cache/dev-libs/elfutils-0.160
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-exceptions
 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(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) !dev-libs/libelf abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r11 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/e/l/elfutils/0.160/elfutils-0.160.tar.bz2 https://fedorahosted.org/releases/e/l/elfutils/0.160/elfutils-portability.patch -> elfutils-0.160-portability.patch
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=caff375a3b267c061bf0f44e1d84243d
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.161 b/metadata/md5-cache/dev-libs/elfutils-0.161
index 0a343284f350..53a9f581296a 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.161
+++ b/metadata/md5-cache/dev-libs/elfutils-0.161
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-exceptions
 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(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) !dev-libs/libelf abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r11 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/e/l/elfutils/0.161/elfutils-0.161.tar.bz2 https://fedorahosted.org/releases/e/l/elfutils/0.161/elfutils-portability-0.161.patch -> elfutils-0.161-portability.patch
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b92c0ae70cb5ee8694390cd8705a0989
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.162 b/metadata/md5-cache/dev-libs/elfutils-0.162
index de37ba10236e..314d7b4d928e 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.162
+++ b/metadata/md5-cache/dev-libs/elfutils-0.162
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-exceptions
 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(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) !dev-libs/libelf abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r11 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/e/l/elfutils/0.162/elfutils-0.162.tar.bz2 https://fedorahosted.org/releases/e/l/elfutils/0.162/elfutils-portability-0.162.patch -> elfutils-0.162-portability.patch
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8da648db59682f89131bdcc79b227cdf
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.163 b/metadata/md5-cache/dev-libs/elfutils-0.163
index 87f491a1367b..90a27c1637e9 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.163
+++ b/metadata/md5-cache/dev-libs/elfutils-0.163
@@ -9,5 +9,5 @@ LICENSE=GPL-2-with-exceptions
 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(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) !dev-libs/libelf abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r11 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/e/l/elfutils/0.163/elfutils-0.163.tar.bz2 https://fedorahosted.org/releases/e/l/elfutils/0.163/elfutils-portability-0.163.patch -> elfutils-0.163-portability.patch
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=9048a35523b95637cbc58bc61a2483b3
diff --git a/metadata/md5-cache/dev-libs/expat-2.1.0-r3 b/metadata/md5-cache/dev-libs/expat-2.1.0-r3
index d21bd431c643..60b86ed9adab 100644
--- a/metadata/md5-cache/dev-libs/expat-2.1.0-r3
+++ b/metadata/md5-cache/dev-libs/expat-2.1.0-r3
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/expat/expat-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=584fa29f1f92f59594f1466248f8d398
diff --git a/metadata/md5-cache/dev-libs/expat-2.1.0-r4 b/metadata/md5-cache/dev-libs/expat-2.1.0-r4
index b6d9a53ebea2..934e3a0f2721 100644
--- a/metadata/md5-cache/dev-libs/expat-2.1.0-r4
+++ b/metadata/md5-cache/dev-libs/expat-2.1.0-r4
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r6 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/expat/expat-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=490aec9cca9668b5ff80fab9b8e245a0
diff --git a/metadata/md5-cache/dev-libs/fribidi-0.19.6 b/metadata/md5-cache/dev-libs/fribidi-0.19.6
index 7e7565267a7c..7e372e9d82b2 100644
--- a/metadata/md5-cache/dev-libs/fribidi-0.19.6
+++ b/metadata/md5-cache/dev-libs/fribidi-0.19.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=test
 SLOT=0
 SRC_URI=http://fribidi.org/download/fribidi-0.19.6.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2c309a805a8600dc027e2fe4aba4950f
diff --git a/metadata/md5-cache/dev-libs/fstrm-0.2.0-r1 b/metadata/md5-cache/dev-libs/fstrm-0.2.0-r1
index 386777896fbc..9e055a8d05a2 100644
--- a/metadata/md5-cache/dev-libs/fstrm-0.2.0-r1
+++ b/metadata/md5-cache/dev-libs/fstrm-0.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=utils? ( dev-libs/libevent[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
 SRC_URI=https://github.com/farsightsec/fstrm/releases/download/v0.2.0/fstrm-0.2.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2dc66c11419b18d848569e883b7223c8
diff --git a/metadata/md5-cache/dev-libs/glib-1.2.10-r6 b/metadata/md5-cache/dev-libs/glib-1.2.10-r6
index dfa4244bc4ec..d993ad6b2dcd 100644
--- a/metadata/md5-cache/dev-libs/glib-1.2.10-r6
+++ b/metadata/md5-cache/dev-libs/glib-1.2.10-r6
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x
 LICENSE=LGPL-2.1+
 SLOT=1
 SRC_URI=mirror://gnome/sources/glib/1.2/glib-1.2.10.tar.gz mirror://gentoo/glib-1.2.10-r1-as-needed.patch.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7fc395697fc9e31e05e8aa170a51c300
diff --git a/metadata/md5-cache/dev-libs/glib-2.40.2 b/metadata/md5-cache/dev-libs/glib-2.40.2
index 99b738c66ab6..ed9309bcfa3c 100644
--- a/metadata/md5-cache/dev-libs/glib-2.40.2
+++ b/metadata/md5-cache/dev-libs/glib-2.40.2
@@ -11,5 +11,5 @@ RDEPEND=!<dev-util/gdbus-codegen-2.40.2 >=virtual/libiconv-0-r1[abi_x86_32(-)?,a
 REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.40/glib-2.40.2.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=a0d56babd4b559214a7688e56564af09
diff --git a/metadata/md5-cache/dev-libs/glib-2.42.2 b/metadata/md5-cache/dev-libs/glib-2.42.2
index aed43f62b7e2..ec8cb8eb2e4c 100644
--- a/metadata/md5-cache/dev-libs/glib-2.42.2
+++ b/metadata/md5-cache/dev-libs/glib-2.42.2
@@ -11,5 +11,5 @@ RDEPEND=!<dev-util/gdbus-codegen-2.42.2 >=virtual/libiconv-0-r1[abi_x86_32(-)?,a
 REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.42/glib-2.42.2.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=7f73664f43835a8b8e5d55842d9f8f18
diff --git a/metadata/md5-cache/dev-libs/glib-2.44.1 b/metadata/md5-cache/dev-libs/glib-2.44.1
index c12aa2b3064c..41cb69ee8106 100644
--- a/metadata/md5-cache/dev-libs/glib-2.44.1
+++ b/metadata/md5-cache/dev-libs/glib-2.44.1
@@ -11,5 +11,5 @@ RDEPEND=!<dev-util/gdbus-codegen-2.44.1 >=virtual/libiconv-0-r1[abi_x86_32(-)?,a
 REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.44/glib-2.44.1.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=c2d9710bb8b22b203df4404fb5eebf2b
diff --git a/metadata/md5-cache/dev-libs/gmp-5.1.3-r1 b/metadata/md5-cache/dev-libs/gmp-5.1.3-r1
index dc6810a3cb0f..a6d5304c8693 100644
--- a/metadata/md5-cache/dev-libs/gmp-5.1.3-r1
+++ b/metadata/md5-cache/dev-libs/gmp-5.1.3-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/gmp/gmp-5.1.3.tar.xz ftp://ftp.gmplib.org/pub/gmp-5.1.3/gmp-5.1.3.tar.xz doc? ( http://gmplib.org/gmp-man-5.1.3.pdf )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=da409025bf0ddd28d5b19e0c1b4ae871
diff --git a/metadata/md5-cache/dev-libs/gmp-6.0.0a b/metadata/md5-cache/dev-libs/gmp-6.0.0a
index b4d7c0bb45a7..c77ba79ac52e 100644
--- a/metadata/md5-cache/dev-libs/gmp-6.0.0a
+++ b/metadata/md5-cache/dev-libs/gmp-6.0.0a
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-3+ GPL-2+ )
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/gmp/gmp-6.0.0a.tar.xz ftp://ftp.gmplib.org/pub/gmp-6.0.0a/gmp-6.0.0a.tar.xz doc? ( http://gmplib.org/gmp-man-6.0.0a.pdf )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=dc98f1787fe042fd3c7979c094d18dd6
diff --git a/metadata/md5-cache/dev-libs/granite-0.3.0 b/metadata/md5-cache/dev-libs/granite-0.3.0
new file mode 100644
index 000000000000..8495d331c177
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/granite-0.3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/glib-2.32:2 dev-libs/gobject-introspection:= dev-libs/libgee:0.8[introspection] >=x11-libs/gtk+-3.11.6:3 || ( dev-lang/vala:0.28 dev-lang/vala:0.26 dev-lang/vala:0.24 ) sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=sys-apps/sed-4
+DESCRIPTION=A development library for elementary development
+EAPI=5
+HOMEPAGE=http://launchpad.net/granite
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-3
+RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/gobject-introspection:= dev-libs/libgee:0.8[introspection] >=x11-libs/gtk+-3.11.6:3
+SLOT=0
+SRC_URI=http://launchpad.net/granite/0.3/0.3/+download/granite-0.3.0.tar.gz
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=7076c6d9aaa892adf9ac1b2894298590
diff --git a/metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140201 b/metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140201
index 6d141e96db78..108ee82d5e43 100644
--- a/metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140201
+++ b/metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140201
@@ -9,5 +9,5 @@ LICENSE=|| ( BSD GPL-3 HIDAPI )
 RDEPEND=virtual/libusb:1[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(-)?] virtual/libudev: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(-)?]
 SLOT=0
 SRC_URI=mirror://debian/pool/main/h/hidapi/hidapi_0.8.0~rc1+git20140201.3a66d4e+dfsg.orig.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8a12cda118875262bd5ad77016237f35
diff --git a/metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140719 b/metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140719
index df4f543e8a75..a511ba544c5f 100644
--- a/metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140719
+++ b/metadata/md5-cache/dev-libs/hidapi-0.8.0_rc1_p20140719
@@ -9,5 +9,5 @@ LICENSE=|| ( BSD GPL-3 HIDAPI )
 RDEPEND=virtual/libusb:1[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(-)?] virtual/libudev: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(-)?]
 SLOT=0
 SRC_URI=https://github.com/signal11/hidapi/archive/d17db57b9d4354752e0af42f5f33007a42ef2906.tar.gz -> hidapi-0.8.0_rc1_p20140719.tgz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c5acb48c229a02021b65d004ced11bfb
diff --git a/metadata/md5-cache/dev-libs/icu-54.1-r1 b/metadata/md5-cache/dev-libs/icu-54.1-r1
index db7e19eff8cc..1a1ea7872086 100644
--- a/metadata/md5-cache/dev-libs/icu-54.1-r1
+++ b/metadata/md5-cache/dev-libs/icu-54.1-r1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=BSD
 SLOT=0/54a
 SRC_URI=http://download.icu-project.org/files/icu4c/54.1/icu4c-54_1-src.tgz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=22835c6d35db1eba5b5b3ecea9bd8f75
diff --git a/metadata/md5-cache/dev-libs/icu-55.1 b/metadata/md5-cache/dev-libs/icu-55.1
index cfdbaea4a9f8..1a989700f70f 100644
--- a/metadata/md5-cache/dev-libs/icu-55.1
+++ b/metadata/md5-cache/dev-libs/icu-55.1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=BSD
 SLOT=0/55
 SRC_URI=http://download.icu-project.org/files/icu4c/55.1/icu4c-55_1-src.tgz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e50047078d55f44b06341e2aa37255a4
diff --git a/metadata/md5-cache/dev-libs/iniparser-3.1-r1 b/metadata/md5-cache/dev-libs/iniparser-3.1-r1
index 9341e0d24326..76c444610cc5 100644
--- a/metadata/md5-cache/dev-libs/iniparser-3.1-r1
+++ b/metadata/md5-cache/dev-libs/iniparser-3.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RESTRICT=test
 SLOT=0
 SRC_URI=http://ndevilla.free.fr/iniparser/iniparser-3.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=592727449dc7bba70cbe461432ae1a7a
diff --git a/metadata/md5-cache/dev-libs/isl-0.12.2 b/metadata/md5-cache/dev-libs/isl-0.12.2
index b3338dcddc55..7abee48999a1 100644
--- a/metadata/md5-cache/dev-libs/isl-0.12.2
+++ b/metadata/md5-cache/dev-libs/isl-0.12.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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(-)?]
 SLOT=0/10
 SRC_URI=http://isl.gforge.inria.fr/isl-0.12.2.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f59978255cf40bb3b08b19c68760aba4
diff --git a/metadata/md5-cache/dev-libs/isl-0.13 b/metadata/md5-cache/dev-libs/isl-0.13
index 1e640056d161..ecf39e0b3c83 100644
--- a/metadata/md5-cache/dev-libs/isl-0.13
+++ b/metadata/md5-cache/dev-libs/isl-0.13
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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(-)?]
 SLOT=0/13
 SRC_URI=http://isl.gforge.inria.fr/isl-0.13.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=59a052b0c6bf5b87585859c4fd3a1477
diff --git a/metadata/md5-cache/dev-libs/isl-0.14 b/metadata/md5-cache/dev-libs/isl-0.14
index f02ac306aa86..8c4ea70381e0 100644
--- a/metadata/md5-cache/dev-libs/isl-0.14
+++ b/metadata/md5-cache/dev-libs/isl-0.14
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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(-)?]
 SLOT=0/14
 SRC_URI=http://isl.gforge.inria.fr/isl-0.14.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=72a294ca92a1bd443928a9e3d09556e4
diff --git a/metadata/md5-cache/dev-libs/isl-0.14.1 b/metadata/md5-cache/dev-libs/isl-0.14.1
index af59f7ccfce2..3b7d426b77bf 100644
--- a/metadata/md5-cache/dev-libs/isl-0.14.1
+++ b/metadata/md5-cache/dev-libs/isl-0.14.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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(-)?]
 SLOT=0/14
 SRC_URI=http://isl.gforge.inria.fr/isl-0.14.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c38cd66305ebb2ddfd33460310ffbf47
diff --git a/metadata/md5-cache/dev-libs/isl-0.15 b/metadata/md5-cache/dev-libs/isl-0.15
index 91790be23808..16fe75566739 100644
--- a/metadata/md5-cache/dev-libs/isl-0.15
+++ b/metadata/md5-cache/dev-libs/isl-0.15
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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(-)?]
 SLOT=0/15
 SRC_URI=http://isl.gforge.inria.fr/isl-0.15.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=567591b56dedbf97026c5d1c404f0982
diff --git a/metadata/md5-cache/dev-libs/jemalloc-3.6.0 b/metadata/md5-cache/dev-libs/jemalloc-3.6.0
index d0c1489ebfad..680d0fe80c76 100644
--- a/metadata/md5-cache/dev-libs/jemalloc-3.6.0
+++ b/metadata/md5-cache/dev-libs/jemalloc-3.6.0
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://www.canonware.com/download/jemalloc/jemalloc-3.6.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=dd5a25d2c23b338f9d6ec246a19a5c2f
diff --git a/metadata/md5-cache/dev-libs/json-c-0.11-r1 b/metadata/md5-cache/dev-libs/json-c-0.11-r1
index 41bbe645f44a..be2e813c05e5 100644
--- a/metadata/md5-cache/dev-libs/json-c-0.11-r1
+++ b/metadata/md5-cache/dev-libs/json-c-0.11-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/0
 SRC_URI=https://s3.amazonaws.com/json-c_releases/releases/json-c-0.11.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=028f3e6be28569b209fb8efcc6cdadc4
diff --git a/metadata/md5-cache/dev-libs/json-c-0.12 b/metadata/md5-cache/dev-libs/json-c-0.12
index 5084d774ac4d..dc46e33901e4 100644
--- a/metadata/md5-cache/dev-libs/json-c-0.12
+++ b/metadata/md5-cache/dev-libs/json-c-0.12
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/0
 SRC_URI=https://s3.amazonaws.com/json-c_releases/releases/json-c-0.12.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f9281f7fcaeb26157b444ab2047ee995
diff --git a/metadata/md5-cache/dev-libs/json-glib-1.0.2-r1 b/metadata/md5-cache/dev-libs/json-glib-1.0.2-r1
index 9c52e7cd74a4..0806596b94b5 100644
--- a/metadata/md5-cache/dev-libs/json-glib-1.0.2-r1
+++ b/metadata/md5-cache/dev-libs/json-glib-1.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.37.6:2[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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/json-glib/1.0/json-glib-1.0.2.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fb7478a0b802f5cbab5ff246d349322f
diff --git a/metadata/md5-cache/dev-libs/json-glib-1.0.4 b/metadata/md5-cache/dev-libs/json-glib-1.0.4
index c787abb25b75..cb928f3e8fcd 100644
--- a/metadata/md5-cache/dev-libs/json-glib-1.0.4
+++ b/metadata/md5-cache/dev-libs/json-glib-1.0.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.37.6:2[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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/json-glib/1.0/json-glib-1.0.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a9c569e95948bb59f16bc381b6035843
diff --git a/metadata/md5-cache/dev-libs/libRocket-1.2.1_p20130110-r1 b/metadata/md5-cache/dev-libs/libRocket-1.2.1_p20130110-r1
index 05e1184d5c96..e9734de0398a 100644
--- a/metadata/md5-cache/dev-libs/libRocket-1.2.1_p20130110-r1
+++ b/metadata/md5-cache/dev-libs/libRocket-1.2.1_p20130110-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hasufell/distfiles/libRocket-1.2.1_p20130110.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1ab139021028dc8cc5847463dabe9df7
diff --git a/metadata/md5-cache/dev-libs/libRocket-1.3.0.0 b/metadata/md5-cache/dev-libs/libRocket-1.3.0.0
index c7504c0354c5..c959ef12181b 100644
--- a/metadata/md5-cache/dev-libs/libRocket-1.3.0.0
+++ b/metadata/md5-cache/dev-libs/libRocket-1.3.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0/1
 SRC_URI=https://github.com/libRocket/libRocket/archive/release-1.3.0.0.tar.gz -> libRocket-1.3.0.0.tar.gz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0f88c79b6ccf89551e6fb5e80b2783de
diff --git a/metadata/md5-cache/dev-libs/libRocket-9999 b/metadata/md5-cache/dev-libs/libRocket-9999
index 5f93324fe3a5..326726bcd583 100644
--- a/metadata/md5-cache/dev-libs/libRocket-9999
+++ b/metadata/md5-cache/dev-libs/libRocket-9999
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=>=media-libs/freetype-2.5.0.1[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(-)?] 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(-)] dev-libs/boost[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) samples? ( virtual/opengl x11-libs/libXext x11-libs/libX11 )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=458fb26fd485857455d345917e4160df
diff --git a/metadata/md5-cache/dev-libs/libaio-0.3.110 b/metadata/md5-cache/dev-libs/libaio-0.3.110
index 2d3ebf575883..d04f16c4db05 100644
--- a/metadata/md5-cache/dev-libs/libaio-0.3.110
+++ b/metadata/md5-cache/dev-libs/libaio-0.3.110
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/l/i/libaio/libaio-0.3.110.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=baf6acc71c2c69601483f93d50f62f3e
diff --git a/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r200 b/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r200
index a357f5671213..805414c03e82 100644
--- a/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r200
+++ b/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r200
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 LGPL-3
 RDEPEND=>=dev-libs/dbus-glib-0.98[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(-)?] >=dev-libs/glib-2.26:2[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(-)?] >=dev-libs/libdbusmenu-0.6.2[gtk,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(-)?] >=dev-libs/libindicator-12.10.0: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(-)?] x11-libs/gtk+:2[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(-)?] introspection? ( >=dev-libs/gobject-introspection-1 )
 SLOT=2
 SRC_URI=http://launchpad.net/libappindicator/12.10/12.10.0/+download/libappindicator-12.10.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2
 _md5_=eeb805897a1658e3d338c09b5aab0c29
diff --git a/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r300 b/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r300
index ed09e68e013f..a66fdb32d052 100644
--- a/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r300
+++ b/metadata/md5-cache/dev-libs/libappindicator-12.10.0-r300
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 LGPL-3
 RDEPEND=>=dev-libs/dbus-glib-0.98[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(-)?] >=dev-libs/glib-2.26:2[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(-)?] >=dev-libs/libdbusmenu-0.6.2[gtk3,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(-)?] >=dev-libs/libindicator-12.10.0:3[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(-)?] >=x11-libs/gtk+-3.2:3[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(-)?] introspection? ( >=dev-libs/gobject-introspection-1 )
 SLOT=3
 SRC_URI=http://launchpad.net/libappindicator/12.10/12.10.0/+download/libappindicator-12.10.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2
 _md5_=fbca003d1b1f047a68abff44bcdce438
diff --git a/metadata/md5-cache/dev-libs/libcdio-0.92 b/metadata/md5-cache/dev-libs/libcdio-0.92
index 85a748f92445..4be08a3d7b73 100644
--- a/metadata/md5-cache/dev-libs/libcdio-0.92
+++ b/metadata/md5-cache/dev-libs/libcdio-0.92
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7 cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0/15
 SRC_URI=mirror://gnu/libcdio/libcdio-0.92.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8567ff46c5bdac3a1891441083f3767b
diff --git a/metadata/md5-cache/dev-libs/libcdio-0.93 b/metadata/md5-cache/dev-libs/libcdio-0.93
index 6bfe62230b73..08afc248be92 100644
--- a/metadata/md5-cache/dev-libs/libcdio-0.93
+++ b/metadata/md5-cache/dev-libs/libcdio-0.93
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!minimal? ( >=sys-libs/ncurses-5.7-r7 cddb? ( >=media-libs/libcddb-1.3.2 ) ) >=virtual/libiconv-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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0/15
 SRC_URI=mirror://gnu/libcdio/libcdio-0.93.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f64b5a6e1a4e7d905ffea80a5a53b7aa
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.90_p1-r1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.90_p1-r1
index b745e3514f23..a28e52e7d6e5 100644
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.90_p1-r1
+++ b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.90_p1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ GPL-2+ LGPL-2.1
 RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.90-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(-)?] >=virtual/libiconv-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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+0.90+1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=3f51ccc444508ab1c4e3a734c7177318
diff --git a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1 b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1
index 7964928b4fc7..72717470127a 100644
--- a/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1
+++ b/metadata/md5-cache/dev-libs/libcdio-paranoia-0.93_p1
@@ -9,5 +9,5 @@ LICENSE=GPL-3+ GPL-2+ LGPL-2.1
 RDEPEND=app-eselect/eselect-cdparanoia >=dev-libs/libcdio-0.93[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(-)?] >=virtual/libiconv-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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/libcdio/libcdio-paranoia-10.2+0.93+1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=59a3168ae7b1a8c43ace61396b344333
diff --git a/metadata/md5-cache/dev-libs/libconfig-1.4.9-r1 b/metadata/md5-cache/dev-libs/libconfig-1.4.9-r1
index 7429e9ff14f8..c16ab7343181 100644
--- a/metadata/md5-cache/dev-libs/libconfig-1.4.9-r1
+++ b/metadata/md5-cache/dev-libs/libconfig-1.4.9-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~mips ppc ppc64 sparc x86 ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.hyperrealm.com/libconfig/libconfig-1.4.9.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=25ca80ad45f54184fd5d44daf188731f
diff --git a/metadata/md5-cache/dev-libs/libconfig-1.5 b/metadata/md5-cache/dev-libs/libconfig-1.5
index 4876eb3c01d7..11c741b5db6a 100644
--- a/metadata/md5-cache/dev-libs/libconfig-1.5
+++ b/metadata/md5-cache/dev-libs/libconfig-1.5
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.hyperrealm.com/libconfig/libconfig-1.5.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f98e1e2b5e6dab5faec265950c1950c0
diff --git a/metadata/md5-cache/dev-libs/libcroco-0.6.8-r1 b/metadata/md5-cache/dev-libs/libcroco-0.6.8-r1
index f989cc50e6b5..73297d97bf52 100644
--- a/metadata/md5-cache/dev-libs/libcroco-0.6.8-r1
+++ b/metadata/md5-cache/dev-libs/libcroco-0.6.8-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] >=dev-libs/libxml2-2.9.1-r4[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.6
 SRC_URI=mirror://gnome/sources/libcroco/0.6/libcroco-0.6.8.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6dc2ce445a9def5993e88d37f7e6ec97
diff --git a/metadata/md5-cache/dev-libs/libcss-0.4.0 b/metadata/md5-cache/dev-libs/libcss-0.4.0
index a5fb46c135c8..5ff62abf24fe 100644
--- a/metadata/md5-cache/dev-libs/libcss-0.4.0
+++ b/metadata/md5-cache/dev-libs/libcss-0.4.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libparserutils-0.2.0-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(-)?] >=dev-libs/libwapcaplet-0.2.1-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(-)?]
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libcss-0.4.0-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.2.tar.gz -> netsurf-buildsystem-1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e99c967642d83031016e6434c2c5f47e
diff --git a/metadata/md5-cache/dev-libs/libcss-0.5.0-r1 b/metadata/md5-cache/dev-libs/libcss-0.5.0-r1
index 1eab78d2474a..8b231f2fd355 100644
--- a/metadata/md5-cache/dev-libs/libcss-0.5.0-r1
+++ b/metadata/md5-cache/dev-libs/libcss-0.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libparserutils-0.2.1-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(-)?] >=dev-libs/libwapcaplet-0.2.2-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(-)?]
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libcss-0.5.0-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.3.tar.gz -> netsurf-buildsystem-1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6a30c9ad8f77ba7cbcd157558ec778d1
diff --git a/metadata/md5-cache/dev-libs/libdaemon-0.14-r2 b/metadata/md5-cache/dev-libs/libdaemon-0.14-r2
index 2773aa4098c6..8bb5bcb975f0 100644
--- a/metadata/md5-cache/dev-libs/libdaemon-0.14-r2
+++ b/metadata/md5-cache/dev-libs/libdaemon-0.14-r2
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~a
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.14.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=026e9cdc1f774909f2f25c3d14001dae
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-12.10.2-r2 b/metadata/md5-cache/dev-libs/libdbusmenu-12.10.2-r2
index d64eb96e8aad..435616f0899c 100644
--- a/metadata/md5-cache/dev-libs/libdbusmenu-12.10.2-r2
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-12.10.2-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 LGPL-3
 RDEPEND=>=dev-libs/dbus-glib-0.100[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(-)?] >=dev-libs/json-glib-0.13.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(-)?] >=dev-libs/glib-2.32[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(-)?] dev-libs/libxml2[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(-)?] gtk? ( x11-libs/gtk+:2[introspection?,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(-)?] ) gtk3? ( >=x11-libs/gtk+-3.2:3[introspection?,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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1 ) !<dev-libs/libdbusmenu-0.5.1-r200
 SLOT=0
 SRC_URI=http://launchpad.net/dbusmenu/12.10/12.10.2/+download/libdbusmenu-12.10.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2
 _md5_=4d3286403c8153d1706b6a356d9b408d
diff --git a/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20140619-r1 b/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20140619-r1
index 14ab46e92f66..ef8d38e28150 100644
--- a/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20140619-r1
+++ b/metadata/md5-cache/dev-libs/libdbusmenu-qt-0.9.3_pre20140619-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( qt4 qt5 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://launchpad.net/ubuntu/+archive/primary/+files/libdbusmenu-qt_0.9.3+14.10.20140619.orig.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=50448c3aa5655432a7392a603579829a
diff --git a/metadata/md5-cache/dev-libs/libedit-20130611.3.1-r1 b/metadata/md5-cache/dev-libs/libedit-20130611.3.1-r1
index e2d88b6cfb7d..b16f57fb1042 100644
--- a/metadata/md5-cache/dev-libs/libedit-20130611.3.1-r1
+++ b/metadata/md5-cache/dev-libs/libedit-20130611.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=sys-libs/ncurses-5.9-r3[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(-)?] !<=sys-freebsd/freebsd-lib-6.2_rc1
 SLOT=0
 SRC_URI=http://www.thrysoee.dk/editline/libedit-20130611-3.1.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0daaba336f5cfa03c65ea10132ed0b0b
diff --git a/metadata/md5-cache/dev-libs/libedit-20130712.3.1 b/metadata/md5-cache/dev-libs/libedit-20130712.3.1
index fddb934f3b94..63c159d6aea4 100644
--- a/metadata/md5-cache/dev-libs/libedit-20130712.3.1
+++ b/metadata/md5-cache/dev-libs/libedit-20130712.3.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=sys-libs/ncurses-5.9-r3[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(-)?] !<=sys-freebsd/freebsd-lib-6.2_rc1
 SLOT=0
 SRC_URI=http://www.thrysoee.dk/editline/libedit-20130712-3.1.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=23d07d8e3e2168de09498a364bd00392
diff --git a/metadata/md5-cache/dev-libs/libelf-0.8.13-r2 b/metadata/md5-cache/dev-libs/libelf-0.8.13-r2
index 165d96679c3d..672a5058d8dd 100644
--- a/metadata/md5-cache/dev-libs/libelf-0.8.13-r2
+++ b/metadata/md5-cache/dev-libs/libelf-0.8.13-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=!dev-libs/elfutils abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r11 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.mr511.de/software/libelf-0.8.13.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8d071fe586779d212486511a8b683416
diff --git a/metadata/md5-cache/dev-libs/libev-4.15-r1 b/metadata/md5-cache/dev-libs/libev-4.15-r1
index f0bd381274e1..124b4e568278 100644
--- a/metadata/md5-cache/dev-libs/libev-4.15-r1
+++ b/metadata/md5-cache/dev-libs/libev-4.15-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( BSD GPL-2 )
 RDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )
 SLOT=0
 SRC_URI=http://dist.schmorp.de/libev/libev-4.15.tar.gz http://dist.schmorp.de/libev/Attic/libev-4.15.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8ad8b29c6d29f30be572d32086f2538b
diff --git a/metadata/md5-cache/dev-libs/libev-4.18 b/metadata/md5-cache/dev-libs/libev-4.18
index 64d2d4a10ee0..8e3a062c32e8 100644
--- a/metadata/md5-cache/dev-libs/libev-4.18
+++ b/metadata/md5-cache/dev-libs/libev-4.18
@@ -9,5 +9,5 @@ LICENSE=|| ( BSD GPL-2 )
 RDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )
 SLOT=0
 SRC_URI=http://dist.schmorp.de/libev/libev-4.18.tar.gz http://dist.schmorp.de/libev/Attic/libev-4.18.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c40b76c8dde63918fee8318d1bfc9c57
diff --git a/metadata/md5-cache/dev-libs/libev-4.19 b/metadata/md5-cache/dev-libs/libev-4.19
index 84b70d09a800..441a44ce3672 100644
--- a/metadata/md5-cache/dev-libs/libev-4.19
+++ b/metadata/md5-cache/dev-libs/libev-4.19
@@ -9,5 +9,5 @@ LICENSE=|| ( BSD GPL-2 )
 RDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )
 SLOT=0
 SRC_URI=http://dist.schmorp.de/libev/libev-4.19.tar.gz http://dist.schmorp.de/libev/Attic/libev-4.19.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=682495dceae1026cf7ffc6a112936b15
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.3 b/metadata/md5-cache/dev-libs/libevdev-1.3
index 834bb9be1f0d..655f2ec28d03 100644
--- a/metadata/md5-cache/dev-libs/libevdev-1.3
+++ b/metadata/md5-cache/dev-libs/libevdev-1.3
@@ -10,5 +10,5 @@ RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/libevdev/libevdev-1.3.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=5c0d9f9d063f5a616b26e49da4beda87
diff --git a/metadata/md5-cache/dev-libs/libevdev-1.4 b/metadata/md5-cache/dev-libs/libevdev-1.4
index fce4f47e223b..0d92eeadef38 100644
--- a/metadata/md5-cache/dev-libs/libevdev-1.4
+++ b/metadata/md5-cache/dev-libs/libevdev-1.4
@@ -10,5 +10,5 @@ RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/libevdev/libevdev-1.4.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=9502f7debe380dff92f64d3bc3623c7d
diff --git a/metadata/md5-cache/dev-libs/libevent-2.0.22 b/metadata/md5-cache/dev-libs/libevent-2.0.22
index eaf63cc26d38..f64608cbc889 100644
--- a/metadata/md5-cache/dev-libs/libevent-2.0.22
+++ b/metadata/md5-cache/dev-libs/libevent-2.0.22
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ssl? ( >=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(-)?] ) !<=dev-libs/9libs-1.0
 SLOT=0
 SRC_URI=mirror://sourceforge/levent/files/libevent-2.0.22-stable.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c3d5e364f556a89dec695de8c6218a43
diff --git a/metadata/md5-cache/dev-libs/libevent-2.1.5 b/metadata/md5-cache/dev-libs/libevent-2.1.5
index e2913d64ad0c..807848b7e0f9 100644
--- a/metadata/md5-cache/dev-libs/libevent-2.1.5
+++ b/metadata/md5-cache/dev-libs/libevent-2.1.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ssl? ( >=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(-)?] ) !<=dev-libs/9libs-1.0
 SLOT=0
 SRC_URI=mirror://sourceforge/levent/files/libevent-2.1.5-beta.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=faf5773a6a1f6a861ad944256b840f3c
diff --git a/metadata/md5-cache/dev-libs/libevent-9999 b/metadata/md5-cache/dev-libs/libevent-9999
index 86ad81ed2a5b..a293c08df1f9 100644
--- a/metadata/md5-cache/dev-libs/libevent-9999
+++ b/metadata/md5-cache/dev-libs/libevent-9999
@@ -7,5 +7,5 @@ IUSE=debug +ssl static-libs test +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_
 LICENSE=BSD
 RDEPEND=ssl? ( >=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(-)?] ) !<=dev-libs/9libs-1.0
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=170d784d825905e58dd58d6d694f34cc
diff --git a/metadata/md5-cache/dev-libs/libffi-3.0.13-r1 b/metadata/md5-cache/dev-libs/libffi-3.0.13-r1
index ec2b665b2fa5..161993de1321 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.0.13-r1
+++ b/metadata/md5-cache/dev-libs/libffi-3.0.13-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/libffi/libffi-3.0.13.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e791112d65ee504bfcbe5e19ba42b8e3
diff --git a/metadata/md5-cache/dev-libs/libffi-3.1-r3 b/metadata/md5-cache/dev-libs/libffi-3.1-r3
index c590e0863591..ceebdf134eaa 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.1-r3
+++ b/metadata/md5-cache/dev-libs/libffi-3.1-r3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/libffi/libffi-3.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ea2e3985603486f784a836744f022d74
diff --git a/metadata/md5-cache/dev-libs/libffi-3.2 b/metadata/md5-cache/dev-libs/libffi-3.2
index 8e4bffe5e99d..9ce39ad3e557 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.2
+++ b/metadata/md5-cache/dev-libs/libffi-3.2
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/libffi/libffi-3.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4264ff7b9ee14c1d3248dead0c17e040
diff --git a/metadata/md5-cache/dev-libs/libffi-3.2.1 b/metadata/md5-cache/dev-libs/libffi-3.2.1
index 389fb96ff6d8..2e38a9fb41ad 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.2.1
+++ b/metadata/md5-cache/dev-libs/libffi-3.2.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=48ea2c9f6af2274652ed9ec9bd9f83f9
diff --git a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r4 b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r4
index 458541313820..3a9cee8ce3df 100644
--- a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r4
+++ b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r4
@@ -10,5 +10,5 @@ RDEPEND=!app-admin/fam !<app-admin/gamin-0.1.10 python? ( =dev-lang/python-2* )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 http://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2 http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ed117bc3574ad031506dd3437d3f8b46
diff --git a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r5 b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r5
index 0445ec45a1fa..d95896383300 100644
--- a/metadata/md5-cache/dev-libs/libgamin-0.1.10-r5
+++ b/metadata/md5-cache/dev-libs/libgamin-0.1.10-r5
@@ -10,5 +10,5 @@ RDEPEND=!app-admin/fam !<app-admin/gamin-0.1.10
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 http://dev.gentoo.org/~grobian/patches/libgamin-0.1.10-opensolaris.patch.bz2 http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4bf0da83678ecdcfa1916acd85366614
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.5.4-r1 b/metadata/md5-cache/dev-libs/libgcrypt-1.5.4-r1
index dc21b06e84ea..53c5e78b8ffb 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.5.4-r1
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.5.4-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.12[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(-)?] !dev-libs/libgcrypt:11 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 SLOT=0/11
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.5.4.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=926abc5cc00593088f3cb619260c927b
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.5.4-r100 b/metadata/md5-cache/dev-libs/libgcrypt-1.5.4-r100
index 1c47496377ec..33ce41463f64 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.5.4-r100
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.5.4-r100
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.12[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(-)?] !dev-libs/libgcrypt:0/11 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 SLOT=11/11
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.5.4.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=64f478ae0e61327e0a662b170ab6089e
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.6.1-r2 b/metadata/md5-cache/dev-libs/libgcrypt-1.6.1-r2
index 43fc50424745..dd15dce0f69d 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.6.1-r2
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.6.1-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.12[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-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.6.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=45b353ac4cd38a431c34fe17470ae9fd
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.6.2 b/metadata/md5-cache/dev-libs/libgcrypt-1.6.2
index fd4554a53eca..f0e5375ccd04 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.6.2
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.6.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.12[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-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.6.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8b9340b42529c7ffcb65933d0debbe18
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.6.3 b/metadata/md5-cache/dev-libs/libgcrypt-1.6.3
index 082269d546a2..d1bed5abc8b1 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.6.3
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.6.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.12[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-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.6.3.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=483ea0c9879abf567699cd32aede6785
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.6.3-r2 b/metadata/md5-cache/dev-libs/libgcrypt-1.6.3-r2
index 7b251eabf463..7ee90a7afa19 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.6.3-r2
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.6.3-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MIT
 RDEPEND=>=dev-libs/libgpg-error-1.12[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-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.6.3.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8d22bca587c1b28dcbd05154de45d882
diff --git a/metadata/md5-cache/dev-libs/libgpg-error-1.13 b/metadata/md5-cache/dev-libs/libgpg-error-1.13
index d18f520fa1ae..9e5a8ff2542b 100644
--- a/metadata/md5-cache/dev-libs/libgpg-error-1.13
+++ b/metadata/md5-cache/dev-libs/libgpg-error-1.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=nls? ( >=virtual/libintl-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(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r12 )
 SLOT=0
 SRC_URI=mirror://gnupg/libgpg-error/libgpg-error-1.13.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=09bf9e8ed5ae122bf27896f6598778c2
diff --git a/metadata/md5-cache/dev-libs/libgpg-error-1.18 b/metadata/md5-cache/dev-libs/libgpg-error-1.18
index bfc4fcf16cf7..0745f3f2230a 100644
--- a/metadata/md5-cache/dev-libs/libgpg-error-1.18
+++ b/metadata/md5-cache/dev-libs/libgpg-error-1.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=nls? ( >=virtual/libintl-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(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r12 )
 SLOT=0
 SRC_URI=mirror://gnupg/libgpg-error/libgpg-error-1.18.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=3f0b6ddf876984313e620a07614bf601
diff --git a/metadata/md5-cache/dev-libs/libgpg-error-1.19 b/metadata/md5-cache/dev-libs/libgpg-error-1.19
index da069b38f282..27f6c4bcef65 100644
--- a/metadata/md5-cache/dev-libs/libgpg-error-1.19
+++ b/metadata/md5-cache/dev-libs/libgpg-error-1.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=nls? ( >=virtual/libintl-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(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r12 )
 SLOT=0
 SRC_URI=mirror://gnupg/libgpg-error/libgpg-error-1.19.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6f576984f5ad423c6f36f27df23c3a1d
diff --git a/metadata/md5-cache/dev-libs/libgudev-230 b/metadata/md5-cache/dev-libs/libgudev-230
index 19a0dd2be14d..91b63243d6ec 100644
--- a/metadata/md5-cache/dev-libs/libgudev-230
+++ b/metadata/md5-cache/dev-libs/libgudev-230
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.22.0:2=[static-libs?] virtual/libudev:=[static-libs?] !sys-fs/eudev[gudev(-)] !sys-fs/udev[gudev(-)] !sys-apps/systemd[gudev(-)]
 SLOT=0/0
 SRC_URI=https://download.gnome.org/sources/libgudev/230/libgudev-230.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7c64be3024237245cbd007880c955b16
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.2.4 b/metadata/md5-cache/dev-libs/libgusb-0.2.4
index 74d88ae1baad..d93c4d660bac 100644
--- a/metadata/md5-cache/dev-libs/libgusb-0.2.4
+++ b/metadata/md5-cache/dev-libs/libgusb-0.2.4
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://people.freedesktop.org/~hughsient/releases/libgusb-0.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c86f62eaeea224de890ce34df5dd0dc3
diff --git a/metadata/md5-cache/dev-libs/libgusb-0.2.5 b/metadata/md5-cache/dev-libs/libgusb-0.2.5
index 172e80637e5d..429411460513 100644
--- a/metadata/md5-cache/dev-libs/libgusb-0.2.5
+++ b/metadata/md5-cache/dev-libs/libgusb-0.2.5
@@ -11,5 +11,5 @@ REQUIRED_USE=vala? ( introspection )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://people.freedesktop.org/~hughsient/releases/libgusb-0.2.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fece262cc1dd92559bce43d8073e5795
diff --git a/metadata/md5-cache/dev-libs/libiconv-1.14-r1 b/metadata/md5-cache/dev-libs/libiconv-1.14-r1
index c9adead8d164..747e598ed849 100644
--- a/metadata/md5-cache/dev-libs/libiconv-1.14-r1
+++ b/metadata/md5-cache/dev-libs/libiconv-1.14-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=!sys-libs/glibc !userland_GNU? ( !sys-apps/man-pages )
 SLOT=0
 SRC_URI=mirror://gnu/libiconv/libiconv-1.14.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=609ce924617ed0606111651dfd65092a
diff --git a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201 b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
index 61a037d35a54..945361273e2b 100644
--- a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
+++ b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r201
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.22[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(-)?] >=x11-libs/gtk+-2.18:2[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
 SRC_URI=http://launchpad.net/libindicator/12.10/12.10.1/+download/libindicator-12.10.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=afd6c84ce3142813e5eb2c5cfda3b213
diff --git a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301 b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
index 20a7eb23707e..cdd5383b627f 100644
--- a/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
+++ b/metadata/md5-cache/dev-libs/libindicator-12.10.1-r301
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.22[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(-)?] >=x11-libs/gtk+-3.2:3[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=3
 SRC_URI=http://launchpad.net/libindicator/12.10/12.10.1/+download/libindicator-12.10.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=4183e09c993cf455d6b381f921062fbb
diff --git a/metadata/md5-cache/dev-libs/libltdl-1.3.5 b/metadata/md5-cache/dev-libs/libltdl-1.3.5
index 61790d1b155b..1a70d67ae784 100644
--- a/metadata/md5-cache/dev-libs/libltdl-1.3.5
+++ b/metadata/md5-cache/dev-libs/libltdl-1.3.5
@@ -9,5 +9,5 @@ RDEPEND=!sys-devel/libtool:1.3
 RESTRICT=test
 SLOT=1.3
 SRC_URI=mirror://gnu/libtool/libtool-1.3.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1b39e4d3ab372655ec094196491e15a3
diff --git a/metadata/md5-cache/dev-libs/libltdl-1.5.26 b/metadata/md5-cache/dev-libs/libltdl-1.5.26
index 85acb320d880..6f89136c1424 100644
--- a/metadata/md5-cache/dev-libs/libltdl-1.5.26
+++ b/metadata/md5-cache/dev-libs/libltdl-1.5.26
@@ -9,5 +9,5 @@ RDEPEND=!sys-devel/libtool:1.5
 RESTRICT=test
 SLOT=1.5
 SRC_URI=mirror://gnu/libtool/libtool-1.5.26.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ec3a8f362bb81ae54a5c10b20b8cb617
diff --git a/metadata/md5-cache/dev-libs/libltdl-2.4.4 b/metadata/md5-cache/dev-libs/libltdl-2.4.4
index 1c135bbc20ce..9f6327fec371 100644
--- a/metadata/md5-cache/dev-libs/libltdl-2.4.4
+++ b/metadata/md5-cache/dev-libs/libltdl-2.4.4
@@ -10,5 +10,5 @@ RDEPEND=!<sys-devel/libtool-2.4.3-r2:2 abi_x86_32? ( !<=app-emulation/emul-linux
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/libtool/libtool-2.4.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e8f4d8bb08b95e112df86af3fb9b4324
diff --git a/metadata/md5-cache/dev-libs/libltdl-2.4.5 b/metadata/md5-cache/dev-libs/libltdl-2.4.5
index ef9bcb566705..dafa14f7b9c5 100644
--- a/metadata/md5-cache/dev-libs/libltdl-2.4.5
+++ b/metadata/md5-cache/dev-libs/libltdl-2.4.5
@@ -10,5 +10,5 @@ RDEPEND=!<sys-devel/libtool-2.4.3-r2:2 abi_x86_32? ( !<=app-emulation/emul-linux
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/libtool/libtool-2.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2ae87cdc561003e7a3cb2930e85e0879
diff --git a/metadata/md5-cache/dev-libs/libltdl-2.4.6 b/metadata/md5-cache/dev-libs/libltdl-2.4.6
index bbb9e35b9d64..9568b41ed5db 100644
--- a/metadata/md5-cache/dev-libs/libltdl-2.4.6
+++ b/metadata/md5-cache/dev-libs/libltdl-2.4.6
@@ -10,5 +10,5 @@ RDEPEND=!<sys-devel/libtool-2.4.3-r2:2 abi_x86_32? ( !<=app-emulation/emul-linux
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnu/libtool/libtool-2.4.6.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1abe09107e3b2eec4574e7c12345233d
diff --git a/metadata/md5-cache/dev-libs/libnl-3.2.24-r1 b/metadata/md5-cache/dev-libs/libnl-3.2.24-r1
index 5682004f23be..e0b014180434 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.2.24-r1
+++ b/metadata/md5-cache/dev-libs/libnl-3.2.24-r1
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) p
 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.24.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=332a8e3df8f7ca8c5af71d2c5a520ba3
diff --git a/metadata/md5-cache/dev-libs/libnl-3.2.25 b/metadata/md5-cache/dev-libs/libnl-3.2.25
index b9c85b08b3d3..9f60563a8438 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.2.25
+++ b/metadata/md5-cache/dev-libs/libnl-3.2.25
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) p
 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	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f7328ee232c2c218b37687ebecff4fae
diff --git a/metadata/md5-cache/dev-libs/libnl-3.2.26 b/metadata/md5-cache/dev-libs/libnl-3.2.26
index f733e436fdb8..a747806a4e38 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.2.26
+++ b/metadata/md5-cache/dev-libs/libnl-3.2.26
@@ -10,5 +10,5 @@ RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) p
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) )
 SLOT=3
 SRC_URI=https://github.com/thom311/libnl/releases/download/libnl3_2_26/libnl-3.2.26.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d3025a287bf5a46ebaa637a270cafba1
diff --git a/metadata/md5-cache/dev-libs/libnl-3.2.9999 b/metadata/md5-cache/dev-libs/libnl-3.2.9999
index f43b0afffae2..bcad40c8a969 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.2.9999
+++ b/metadata/md5-cache/dev-libs/libnl-3.2.9999
@@ -8,5 +8,5 @@ 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
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=44dd1829e4161461367ba5f2b20205d0
diff --git a/metadata/md5-cache/dev-libs/libnsfb-0.1.2 b/metadata/md5-cache/dev-libs/libnsfb-0.1.2
index 4e5374ca577b..055dadb7b67f 100644
--- a/metadata/md5-cache/dev-libs/libnsfb-0.1.2
+++ b/metadata/md5-cache/dev-libs/libnsfb-0.1.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sdl? ( >=media-libs/libsdl-1.2.15-r4[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(-)?] ) vnc? ( >=net-libs/libvncserver-0.9.9-r2[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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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(-)?] ) xcb? ( >=x11-libs/libxcb-1.9.1[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(-)?] >=x11-libs/xcb-util-0.3.9-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(-)?] >=x11-libs/xcb-util-image-0.3.9-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(-)?] >=x11-libs/xcb-util-keysyms-0.3.9-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(-)?] )
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libnsfb-0.1.2-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.2.tar.gz -> netsurf-buildsystem-1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4f00ad8eb013d2395644fc0c1c1337c3
diff --git a/metadata/md5-cache/dev-libs/libnsfb-0.1.3-r1 b/metadata/md5-cache/dev-libs/libnsfb-0.1.3-r1
index b738c3e330c0..2d754d07184d 100644
--- a/metadata/md5-cache/dev-libs/libnsfb-0.1.3-r1
+++ b/metadata/md5-cache/dev-libs/libnsfb-0.1.3-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=sdl? ( >=media-libs/libsdl-1.2.15-r4[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(-)?] ) vnc? ( >=net-libs/libvncserver-0.9.9-r2[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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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(-)?] ) xcb? ( >=x11-libs/libxcb-1.9.1[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(-)?] >=x11-libs/xcb-util-0.3.9-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(-)?] >=x11-libs/xcb-util-image-0.3.9-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(-)?] >=x11-libs/xcb-util-keysyms-0.3.9-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(-)?] )
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libnsfb-0.1.3-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.3.tar.gz -> netsurf-buildsystem-1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=cff901ef315a585cc14448748ebfbe60
diff --git a/metadata/md5-cache/dev-libs/libnsutils-0.0.1-r1 b/metadata/md5-cache/dev-libs/libnsutils-0.0.1-r1
index 6b0fa0548718..746b23c8072d 100644
--- a/metadata/md5-cache/dev-libs/libnsutils-0.0.1-r1
+++ b/metadata/md5-cache/dev-libs/libnsutils-0.0.1-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libnsutils-0.0.1-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.3.tar.gz -> netsurf-buildsystem-1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a06b418c0d99cf4abff5cbd09aa4e982
diff --git a/metadata/md5-cache/dev-libs/libntru-0.2 b/metadata/md5-cache/dev-libs/libntru-0.2
index d0c7e17c818b..1ceff1bba2af 100644
--- a/metadata/md5-cache/dev-libs/libntru-0.2
+++ b/metadata/md5-cache/dev-libs/libntru-0.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/tbuktu/libntru/archive/0.2.tar.gz -> libntru-0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=5dec44bf387cf2cc3a422829f568a8ea
diff --git a/metadata/md5-cache/dev-libs/libntru-0.3 b/metadata/md5-cache/dev-libs/libntru-0.3
index c938e7b76169..821cd0db3320 100644
--- a/metadata/md5-cache/dev-libs/libntru-0.3
+++ b/metadata/md5-cache/dev-libs/libntru-0.3
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/tbuktu/libntru/archive/0.3.tar.gz -> libntru-0.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=326ec29d724c367df47a17e6e94cc8fd
diff --git a/metadata/md5-cache/dev-libs/liboil-0.3.17-r2 b/metadata/md5-cache/dev-libs/liboil-0.3.17-r2
index e57696bc8ad4..41db799e6e41 100644
--- a/metadata/md5-cache/dev-libs/liboil-0.3.17-r2
+++ b/metadata/md5-cache/dev-libs/liboil-0.3.17-r2
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=examples? ( dev-libs/glib:2 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r9 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0.3
 SRC_URI=http://liboil.freedesktop.org/download/liboil-0.3.17.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=554667a0979d1e0c6dbc1ff6e0ef7517
diff --git a/metadata/md5-cache/dev-libs/libparserutils-0.1.2 b/metadata/md5-cache/dev-libs/libparserutils-0.1.2
index 1568601bf396..9a754a385415 100644
--- a/metadata/md5-cache/dev-libs/libparserutils-0.1.2
+++ b/metadata/md5-cache/dev-libs/libparserutils-0.1.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~m68k-mint
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libparserutils-0.1.2-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.0.tar.gz -> netsurf-buildsystem-1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=12e5ad7c1a6411bf08110b587899a6bc
diff --git a/metadata/md5-cache/dev-libs/libparserutils-0.2.0-r1 b/metadata/md5-cache/dev-libs/libparserutils-0.2.0-r1
index ba3631b75b82..53f2b0ed9a79 100644
--- a/metadata/md5-cache/dev-libs/libparserutils-0.2.0-r1
+++ b/metadata/md5-cache/dev-libs/libparserutils-0.2.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~m68k-mint
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libparserutils-0.2.0-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.2.tar.gz -> netsurf-buildsystem-1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=3d6921805ae69d6d6a6925d9bf4deddd
diff --git a/metadata/md5-cache/dev-libs/libparserutils-0.2.1-r1 b/metadata/md5-cache/dev-libs/libparserutils-0.2.1-r1
index 68e410072018..0ac5d6fd5e74 100644
--- a/metadata/md5-cache/dev-libs/libparserutils-0.2.1-r1
+++ b/metadata/md5-cache/dev-libs/libparserutils-0.2.1-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~m68k-mint
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libparserutils-0.2.1-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.3.tar.gz -> netsurf-buildsystem-1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0837855877efcb999e25c8e3fd235419
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.35 b/metadata/md5-cache/dev-libs/libpcre-8.35
index 9c421bcd86ff..0027b5251fac 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.35
+++ b/metadata/md5-cache/dev-libs/libpcre-8.35
@@ -10,5 +10,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/li
 REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.35.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.35.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=37befc117bb0164f77fb3e12e4bb3ee8
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.36 b/metadata/md5-cache/dev-libs/libpcre-8.36
index 1b20b3fc5b84..bfe286099c9c 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.36
+++ b/metadata/md5-cache/dev-libs/libpcre-8.36
@@ -10,5 +10,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/li
 REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.36.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.36.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6d4c904e1eabe69cb12832f465d43448
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.37 b/metadata/md5-cache/dev-libs/libpcre-8.37
index 6c5efae97aeb..10197fde7a6a 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.37
+++ b/metadata/md5-cache/dev-libs/libpcre-8.37
@@ -10,5 +10,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/li
 REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.37.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.37.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=20ea46972c2509bd858396bc97f2137c
diff --git a/metadata/md5-cache/dev-libs/libpcre-8.37-r1 b/metadata/md5-cache/dev-libs/libpcre-8.37-r1
index 5efb6e0b1ae8..4f4bf4748f04 100644
--- a/metadata/md5-cache/dev-libs/libpcre-8.37-r1
+++ b/metadata/md5-cache/dev-libs/libpcre-8.37-r1
@@ -10,5 +10,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) libedit? ( dev-libs/li
 REQUIRED_USE=readline? ( !libedit ) libedit? ( !readline )
 SLOT=3
 SRC_URI=mirror://sourceforge/pcre/pcre-8.37.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.37.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b9b270e432f6eb08a0bb42928675aee8
diff --git a/metadata/md5-cache/dev-libs/libpthread-stubs-0.3-r1 b/metadata/md5-cache/dev-libs/libpthread-stubs-0.3-r1
index 67838c9768f7..9cb7d7f2fd0e 100644
--- a/metadata/md5-cache/dev-libs/libpthread-stubs-0.3-r1
+++ b/metadata/md5-cache/dev-libs/libpthread-stubs-0.3-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libpthread-stubs-0.3.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=27fe7c365d74af31b6814c71b4eba4da
diff --git a/metadata/md5-cache/dev-libs/librevenge-0.0.1 b/metadata/md5-cache/dev-libs/librevenge-0.0.1
index 34be1683cbad..77f226d32bcb 100644
--- a/metadata/md5-cache/dev-libs/librevenge-0.0.1
+++ b/metadata/md5-cache/dev-libs/librevenge-0.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-2.0 LGPL-2.1 )
 RDEPEND=dev-libs/boost:= sys-libs/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(-)?]
 SLOT=0
 SRC_URI=http://sf.net/projects/libwpd/files/librevenge/librevenge-0.0.1/librevenge-0.0.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=153318684a7ade61f72ebe6e9295970f
diff --git a/metadata/md5-cache/dev-libs/librevenge-0.0.2 b/metadata/md5-cache/dev-libs/librevenge-0.0.2
index d7da06d0e781..ea9f94507471 100644
--- a/metadata/md5-cache/dev-libs/librevenge-0.0.2
+++ b/metadata/md5-cache/dev-libs/librevenge-0.0.2
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-2.0 LGPL-2.1 )
 RDEPEND=dev-libs/boost:= sys-libs/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(-)?]
 SLOT=0
 SRC_URI=http://sf.net/projects/libwpd/files/librevenge/librevenge-0.0.2/librevenge-0.0.2.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=fa46f06c3e3a17bc05ade0f1d97f3bf6
diff --git a/metadata/md5-cache/dev-libs/librevenge-9999 b/metadata/md5-cache/dev-libs/librevenge-9999
index 04cc2e58a9a6..5cf510875b3b 100644
--- a/metadata/md5-cache/dev-libs/librevenge-9999
+++ b/metadata/md5-cache/dev-libs/librevenge-9999
@@ -7,5 +7,5 @@ IUSE=doc test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mi
 LICENSE=|| ( MPL-2.0 LGPL-2.1 )
 RDEPEND=dev-libs/boost:= sys-libs/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(-)?]
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1942c6e348aa837e5afa997304f3e371
diff --git a/metadata/md5-cache/dev-libs/libsigc++-2.4.1 b/metadata/md5-cache/dev-libs/libsigc++-2.4.1
index ed3769762b0a..1a7819a1776b 100644
--- a/metadata/md5-cache/dev-libs/libsigc++-2.4.1
+++ b/metadata/md5-cache/dev-libs/libsigc++-2.4.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-cpplibs-20140508-r1 !app-emulation/emul-linux-x86-cpplibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/libsigc++/2.4/libsigc++-2.4.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=495fe43ebfa0db41f6124ee822f357a1
diff --git a/metadata/md5-cache/dev-libs/libtasn1-4.5 b/metadata/md5-cache/dev-libs/libtasn1-4.5
index f3daa8ef1bda..b7e5b3630f4f 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-4.5
+++ b/metadata/md5-cache/dev-libs/libtasn1-4.5
@@ -9,5 +9,5 @@ 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	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0d934895053aefe28986a33934cd2db0
diff --git a/metadata/md5-cache/dev-libs/libunistring-0.9.5 b/metadata/md5-cache/dev-libs/libunistring-0.9.5
index 13753cf007d0..a81280b74176 100644
--- a/metadata/md5-cache/dev-libs/libunistring-0.9.5
+++ b/metadata/md5-cache/dev-libs/libunistring-0.9.5
@@ -3,9 +3,9 @@ DESCRIPTION=Library for manipulating Unicode strings and C strings according to
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/libunistring/
 IUSE=doc static-libs
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~x86 ~amd64-linux
 LICENSE=LGPL-3 GPL-3
 SLOT=0/2
 SRC_URI=mirror://gnu/libunistring/libunistring-0.9.5.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=f7c6c152ea0cc0f047156e85d75a73cd
+_md5_=25f146c081e4a0f5778adc91373236f8
diff --git a/metadata/md5-cache/dev-libs/libusb-1.0.18 b/metadata/md5-cache/dev-libs/libusb-1.0.18
index a4dd27316f7c..0c436324079c 100644
--- a/metadata/md5-cache/dev-libs/libusb-1.0.18
+++ b/metadata/md5-cache/dev-libs/libusb-1.0.18
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=udev? ( >=virtual/libudev-208:=[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-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=1
 SRC_URI=mirror://sourceforge/libusb/libusb-1.0.18.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=06335669fdea62802c908af2779e0fe3
diff --git a/metadata/md5-cache/dev-libs/libusb-1.0.19 b/metadata/md5-cache/dev-libs/libusb-1.0.19
index 491cff1d3e80..dc75520ea2d2 100644
--- a/metadata/md5-cache/dev-libs/libusb-1.0.19
+++ b/metadata/md5-cache/dev-libs/libusb-1.0.19
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=udev? ( >=virtual/libudev-208:=[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-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=1
 SRC_URI=mirror://sourceforge/libusb/libusb-1.0.19.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=04e66ad58326d48dfb6704dc5785df47
diff --git a/metadata/md5-cache/dev-libs/libusb-1.0.9-r2 b/metadata/md5-cache/dev-libs/libusb-1.0.9-r2
index 26a3eb5d0776..aef1cc07e4fe 100644
--- a/metadata/md5-cache/dev-libs/libusb-1.0.9-r2
+++ b/metadata/md5-cache/dev-libs/libusb-1.0.9-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=1
 SRC_URI=mirror://sourceforge/libusb/libusb-1.0.9.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e6639f01792bb8fdf6064f237b838f7b
diff --git a/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r2 b/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r2
index 49aec9548e6a..2610d3afac2b 100644
--- a/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r2
+++ b/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/libusb-1-r1:1[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(-)?] !dev-libs/libusb:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/libusb/libusb-compat-0.1.5.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d07544fc43d69412a5bb8cfb69ab4287
diff --git a/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3 b/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3
index fc4eadb8dae9..b780d8ea071b 100644
--- a/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3
+++ b/metadata/md5-cache/dev-libs/libusb-compat-0.1.5-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=virtual/libusb-1-r1:1[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(-)?] !dev-libs/libusb:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/libusb/libusb-compat-0.1.5.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f9993e2d95c66c1f619e35d5d8d59344
diff --git a/metadata/md5-cache/dev-libs/libutf8proc-1.1.6-r1 b/metadata/md5-cache/dev-libs/libutf8proc-1.1.6-r1
index 5b38978d6b8e..629b3e8a1a8c 100644
--- a/metadata/md5-cache/dev-libs/libutf8proc-1.1.6-r1
+++ b/metadata/md5-cache/dev-libs/libutf8proc-1.1.6-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libutf8proc-1.1.6-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.3.tar.gz -> netsurf-buildsystem-1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b30b0da8ab293839178638bb43a63a7e
diff --git a/metadata/md5-cache/dev-libs/libuv-0.11.25-r1 b/metadata/md5-cache/dev-libs/libuv-0.11.25-r1
index a512f96bbb3e..8cf59683c949 100644
--- a/metadata/md5-cache/dev-libs/libuv-0.11.25-r1
+++ b/metadata/md5-cache/dev-libs/libuv-0.11.25-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD BSD-2 ISC MIT
 SLOT=0/11
 SRC_URI=https://github.com/libuv/libuv/archive/v0.11.25.tar.gz -> libuv-0.11.25.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e466e04c5b0281d95f2ce29def27bb23
diff --git a/metadata/md5-cache/dev-libs/libuv-0.11.29 b/metadata/md5-cache/dev-libs/libuv-0.11.29
index f1adbc72321e..22aa98b48746 100644
--- a/metadata/md5-cache/dev-libs/libuv-0.11.29
+++ b/metadata/md5-cache/dev-libs/libuv-0.11.29
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD BSD-2 ISC MIT
 SLOT=0/11
 SRC_URI=https://github.com/libuv/libuv/archive/v0.11.29.tar.gz -> libuv-0.11.29.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=442d2bf1ddae29a7b7b32d702390e152
diff --git a/metadata/md5-cache/dev-libs/libuv-1.1.0 b/metadata/md5-cache/dev-libs/libuv-1.1.0
index aab3ebfad831..8e082f3d885d 100644
--- a/metadata/md5-cache/dev-libs/libuv-1.1.0
+++ b/metadata/md5-cache/dev-libs/libuv-1.1.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD BSD-2 ISC MIT
 SLOT=0/1
 SRC_URI=https://github.com/libuv/libuv/archive/v1.1.0.tar.gz -> libuv-1.1.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6c8141bc590f32f235241cbcd8ca26c2
diff --git a/metadata/md5-cache/dev-libs/libuv-1.4.2 b/metadata/md5-cache/dev-libs/libuv-1.4.2
index 4162a5d49004..66046b374bc2 100644
--- a/metadata/md5-cache/dev-libs/libuv-1.4.2
+++ b/metadata/md5-cache/dev-libs/libuv-1.4.2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD BSD-2 ISC MIT
 SLOT=0/1
 SRC_URI=https://github.com/libuv/libuv/archive/v1.4.2.tar.gz -> libuv-1.4.2.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=9b7eec52e6cba10903b5bf18b401c619
diff --git a/metadata/md5-cache/dev-libs/libuv-1.5.0 b/metadata/md5-cache/dev-libs/libuv-1.5.0
index 00c9e23ca345..bd7f0109eefe 100644
--- a/metadata/md5-cache/dev-libs/libuv-1.5.0
+++ b/metadata/md5-cache/dev-libs/libuv-1.5.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD BSD-2 ISC MIT
 SLOT=0/1
 SRC_URI=https://github.com/libuv/libuv/archive/v1.5.0.tar.gz -> libuv-1.5.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e97082ceb7146ba5beec8c8fc217a790
diff --git a/metadata/md5-cache/dev-libs/libuv-1.6.1 b/metadata/md5-cache/dev-libs/libuv-1.6.1
index 7541bcb1ee9c..7ccbacb7f380 100644
--- a/metadata/md5-cache/dev-libs/libuv-1.6.1
+++ b/metadata/md5-cache/dev-libs/libuv-1.6.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD BSD-2 ISC MIT
 SLOT=0/1
 SRC_URI=https://github.com/libuv/libuv/archive/v1.6.1.tar.gz -> libuv-1.6.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=dd6607f476c11d40efefc0c1487ad210
diff --git a/metadata/md5-cache/dev-libs/libverto-0.2.5-r1 b/metadata/md5-cache/dev-libs/libverto-0.2.5-r1
index 66fffc926c5c..4aa4ef98687b 100644
--- a/metadata/md5-cache/dev-libs/libverto-0.2.5-r1
+++ b/metadata/md5-cache/dev-libs/libverto-0.2.5-r1
@@ -10,5 +10,5 @@ RDEPEND=!=app-crypt/mit-krb5-1.10.1-r0 !=app-crypt/mit-krb5-1.10.1-r1 !=app-cryp
 REQUIRED_USE=|| ( glib libev libevent tevent )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/l/i/libverto/libverto-0.2.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=9b547fb79158dbdf73036acc34e02b22
diff --git a/metadata/md5-cache/dev-libs/libverto-0.2.6 b/metadata/md5-cache/dev-libs/libverto-0.2.6
index c9b65612f634..537dc61d939f 100644
--- a/metadata/md5-cache/dev-libs/libverto-0.2.6
+++ b/metadata/md5-cache/dev-libs/libverto-0.2.6
@@ -10,5 +10,5 @@ RDEPEND=!=app-crypt/mit-krb5-1.10.1-r0 !=app-crypt/mit-krb5-1.10.1-r1 !=app-cryp
 REQUIRED_USE=|| ( glib libev libevent tevent )
 SLOT=0
 SRC_URI=https://fedorahosted.org/releases/l/i/libverto/libverto-0.2.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7564bf076bbd002be9f63ee3375988d0
diff --git a/metadata/md5-cache/dev-libs/libwapcaplet-0.2.1-r1 b/metadata/md5-cache/dev-libs/libwapcaplet-0.2.1-r1
index e20181fbc9fb..1a6afc071b28 100644
--- a/metadata/md5-cache/dev-libs/libwapcaplet-0.2.1-r1
+++ b/metadata/md5-cache/dev-libs/libwapcaplet-0.2.1-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~m68k-mint
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libwapcaplet-0.2.1-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.2.tar.gz -> netsurf-buildsystem-1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ae6d822b53cfd08821a58d3a1a72f2e8
diff --git a/metadata/md5-cache/dev-libs/libwapcaplet-0.2.2-r1 b/metadata/md5-cache/dev-libs/libwapcaplet-0.2.2-r1
index feb75897ca71..0f20d5072cf2 100644
--- a/metadata/md5-cache/dev-libs/libwapcaplet-0.2.2-r1
+++ b/metadata/md5-cache/dev-libs/libwapcaplet-0.2.2-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~m68k-mint
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libwapcaplet-0.2.2-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.3.tar.gz -> netsurf-buildsystem-1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=dd0b2df793f61bb02f13ff00da036eae
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.2-r1 b/metadata/md5-cache/dev-libs/libxml2-2.9.2-r1
index cddd672f9123..24366fa93f4c 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.2-r1
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.2-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=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(-)?] icu? ( >=dev-libs/icu-51.2-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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) >=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(-)] ) readline? ( sys-libs/readline:= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r6 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.2.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz http://www.w3.org/XML/Test/xmlts20080827.tar.gz )
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=bb84edb53cb86bdf4b63daef6436cd43
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.28-r2 b/metadata/md5-cache/dev-libs/libxslt-1.1.28-r2
index b0f68339be4e..88f3a65a993b 100644
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.28-r2
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.28-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.28.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f2b5f394af2d24ceb9e00fbc6a3bb227
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.28-r3 b/metadata/md5-cache/dev-libs/libxslt-1.1.28-r3
index 6a15da371ba4..3539504fd872 100644
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.28-r3
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.28-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.28.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=21ca20d4d7bfa4cbdf8b4236f52ea62d
diff --git a/metadata/md5-cache/dev-libs/libxslt-1.1.28-r4 b/metadata/md5-cache/dev-libs/libxslt-1.1.28-r4
index 7c8c9283870f..36044c75d874 100644
--- a/metadata/md5-cache/dev-libs/libxslt-1.1.28-r4
+++ b/metadata/md5-cache/dev-libs/libxslt-1.1.28-r4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.1-r5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=ftp://xmlsoft.org/libxslt/libxslt-1.1.28.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8f4709439ce97b7913aa2f6aac820196
diff --git a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3 b/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3
index 26f18b326c72..af6f18973a36 100644
--- a/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3
+++ b/metadata/md5-cache/dev-libs/lockdev-1.0.3.1.2-r3
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://debian/pool/main/l/lockdev/lockdev_1.0.3.orig.tar.gz mirror://debian/pool/main/l/lockdev/lockdev_1.0.3-1.2.diff.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9f9a386c0cd232d60c04c1158b49a73b
diff --git a/metadata/md5-cache/dev-libs/log4cpp-1.1 b/metadata/md5-cache/dev-libs/log4cpp-1.1
index ed9e9fcf22fc..22a4a8f306af 100644
--- a/metadata/md5-cache/dev-libs/log4cpp-1.1
+++ b/metadata/md5-cache/dev-libs/log4cpp-1.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~s390 ~x86
 LICENSE=LGPL-2.1
 SLOT=0/5
 SRC_URI=mirror://sourceforge/log4cpp/log4cpp-1.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=91653d7d2d5c4374a50c4da415bc69ba
diff --git a/metadata/md5-cache/dev-libs/lzo-2.08 b/metadata/md5-cache/dev-libs/lzo-2.08
index 9ece4cefbf29..e19e8902d5b1 100644
--- a/metadata/md5-cache/dev-libs/lzo-2.08
+++ b/metadata/md5-cache/dev-libs/lzo-2.08
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 SLOT=2
 SRC_URI=http://www.oberhumer.com/opensource/lzo/download/lzo-2.08.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4364171a668bf8e12eecee4317584d4b
diff --git a/metadata/md5-cache/dev-libs/lzo-2.08-r1 b/metadata/md5-cache/dev-libs/lzo-2.08-r1
index c9ba03c2513a..1f63796fce55 100644
--- a/metadata/md5-cache/dev-libs/lzo-2.08-r1
+++ b/metadata/md5-cache/dev-libs/lzo-2.08-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 SLOT=2
 SRC_URI=http://www.oberhumer.com/opensource/lzo/download/lzo-2.08.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=16a6c104a5f9a27a9616c12f87d25014
diff --git a/metadata/md5-cache/dev-libs/m17n-lib-1.5.3 b/metadata/md5-cache/dev-libs/m17n-lib-1.5.3
deleted file mode 100644
index 9619f94e612f..000000000000
--- a/metadata/md5-cache/dev-libs/m17n-lib-1.5.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libXaw x11-libs/libICE x11-libs/libSM x11-libs/libXrender x11-libs/libXft dev-libs/libxml2 dev-libs/fribidi >=media-libs/freetype-2.1 media-libs/fontconfig gd? ( media-libs/gd[png] ) >=dev-libs/libotf-0.9.4 >=dev-db/m17n-db-1.5.3 virtual/pkgconfig
-DESCRIPTION=Multilingual Library for Unix/Linux
-EAPI=2
-HOMEPAGE=https://savannah.nongnu.org/projects/m17n
-IUSE=gd
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=x11-libs/libXaw x11-libs/libICE x11-libs/libSM x11-libs/libXrender x11-libs/libXft dev-libs/libxml2 dev-libs/fribidi >=media-libs/freetype-2.1 media-libs/fontconfig gd? ( media-libs/gd[png] ) >=dev-libs/libotf-0.9.4 >=dev-db/m17n-db-1.5.3
-SLOT=0
-SRC_URI=http://www.m17n.org/m17n-lib-download/m17n-lib-1.5.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=bbe9ccb124b9483981e66dd1361e1242
diff --git a/metadata/md5-cache/dev-libs/m17n-lib-1.5.4 b/metadata/md5-cache/dev-libs/m17n-lib-1.5.4
deleted file mode 100644
index ae794a2dfb88..000000000000
--- a/metadata/md5-cache/dev-libs/m17n-lib-1.5.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libXaw x11-libs/libICE x11-libs/libSM x11-libs/libXrender x11-libs/libXft dev-libs/libxml2 dev-libs/fribidi >=media-libs/freetype-2.1 media-libs/fontconfig gd? ( media-libs/gd[png] ) >=dev-libs/libotf-0.9.4 >=dev-db/m17n-db-1.5.4 virtual/pkgconfig
-DESCRIPTION=Multilingual Library for Unix/Linux
-EAPI=2
-HOMEPAGE=https://savannah.nongnu.org/projects/m17n
-IUSE=gd
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
-LICENSE=LGPL-2.1
-RDEPEND=x11-libs/libXaw x11-libs/libICE x11-libs/libSM x11-libs/libXrender x11-libs/libXft dev-libs/libxml2 dev-libs/fribidi >=media-libs/freetype-2.1 media-libs/fontconfig gd? ( media-libs/gd[png] ) >=dev-libs/libotf-0.9.4 >=dev-db/m17n-db-1.5.4
-SLOT=0
-SRC_URI=http://www.m17n.org/m17n-lib-download/m17n-lib-1.5.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=bde105959ddfb393143dab4bd89d621c
diff --git a/metadata/md5-cache/dev-libs/mpc-1.0.2-r1 b/metadata/md5-cache/dev-libs/mpc-1.0.2-r1
index e1b9b2597fff..c22cefca6a00 100644
--- a/metadata/md5-cache/dev-libs/mpc-1.0.2-r1
+++ b/metadata/md5-cache/dev-libs/mpc-1.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-4.3.2[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(-)?,static-libs?] >=dev-libs/mpfr-2.4.2[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(-)?,static-libs?]
 SLOT=0
 SRC_URI=http://www.multiprecision.org/mpc/download/mpc-1.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4bba4b003971ca6d37592599e141eabe
diff --git a/metadata/md5-cache/dev-libs/mpc-1.0.3 b/metadata/md5-cache/dev-libs/mpc-1.0.3
index 596adc62707f..bcf46f5cdd91 100644
--- a/metadata/md5-cache/dev-libs/mpc-1.0.3
+++ b/metadata/md5-cache/dev-libs/mpc-1.0.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-4.3.2[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(-)?,static-libs?] >=dev-libs/mpfr-2.4.2[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(-)?,static-libs?]
 SLOT=0
 SRC_URI=http://www.multiprecision.org/mpc/download/mpc-1.0.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b167b7a5e0f72850828594b001185c10
diff --git a/metadata/md5-cache/dev-libs/mpfr-3.1.2_p10 b/metadata/md5-cache/dev-libs/mpfr-3.1.2_p10
index ea228738a03e..5e30cc29cb78 100644
--- a/metadata/md5-cache/dev-libs/mpfr-3.1.2_p10
+++ b/metadata/md5-cache/dev-libs/mpfr-3.1.2_p10
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-4.1.4-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(-)?,static-libs?]
 SLOT=0
 SRC_URI=http://www.mpfr.org/mpfr-3.1.2/mpfr-3.1.2.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7ab54de4458bff6950552827162f7bdb
diff --git a/metadata/md5-cache/dev-libs/mpfr-3.1.3 b/metadata/md5-cache/dev-libs/mpfr-3.1.3
index 88e67c82ac91..cf4a2a3c33e9 100644
--- a/metadata/md5-cache/dev-libs/mpfr-3.1.3
+++ b/metadata/md5-cache/dev-libs/mpfr-3.1.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-4.1.4-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(-)?,static-libs?]
 SLOT=0
 SRC_URI=http://www.mpfr.org/mpfr-3.1.3/mpfr-3.1.3.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f7eed0bda666d188ff52a44a085b4f42
diff --git a/metadata/md5-cache/dev-libs/msgpack-0.5.9 b/metadata/md5-cache/dev-libs/msgpack-0.5.9
index c5a69af2d41b..5f5a20ff5e80 100644
--- a/metadata/md5-cache/dev-libs/msgpack-0.5.9
+++ b/metadata/md5-cache/dev-libs/msgpack-0.5.9
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-0.5.9/msgpack-0.5.9.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6ad3e7485f652486a2df3faf43cf7ade
diff --git a/metadata/md5-cache/dev-libs/msgpack-1.0.0 b/metadata/md5-cache/dev-libs/msgpack-1.0.0
index 9bfbd28e2615..42bd8334a2b0 100644
--- a/metadata/md5-cache/dev-libs/msgpack-1.0.0
+++ b/metadata/md5-cache/dev-libs/msgpack-1.0.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-1.0.0/msgpack-1.0.0.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f247847b70e25d278dfbaf84a6c18456
diff --git a/metadata/md5-cache/dev-libs/msgpack-1.0.1 b/metadata/md5-cache/dev-libs/msgpack-1.0.1
index 9ed0a781e491..c9098929e80e 100644
--- a/metadata/md5-cache/dev-libs/msgpack-1.0.1
+++ b/metadata/md5-cache/dev-libs/msgpack-1.0.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-1.0.1/msgpack-1.0.1.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2c9d68b40f06342725d69055105e83a8
diff --git a/metadata/md5-cache/dev-libs/msgpack-1.1.0 b/metadata/md5-cache/dev-libs/msgpack-1.1.0
index ecb1fdc63cb5..5d14bb9af494 100644
--- a/metadata/md5-cache/dev-libs/msgpack-1.1.0
+++ b/metadata/md5-cache/dev-libs/msgpack-1.1.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/msgpack/msgpack-c/releases/download/cpp-1.1.0/msgpack-1.1.0.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=dc0ce2bab16fb2a040bdff09d548d785
diff --git a/metadata/md5-cache/dev-libs/nanomsg-0.5-r1 b/metadata/md5-cache/dev-libs/nanomsg-0.5-r1
index 314341ec9e52..34b19fa772a3 100644
--- a/metadata/md5-cache/dev-libs/nanomsg-0.5-r1
+++ b/metadata/md5-cache/dev-libs/nanomsg-0.5-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~x86
 LICENSE=MIT
 SLOT=0/0.2.1
 SRC_URI=http://download.nanomsg.org/nanomsg-0.5-beta.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=311b8f7f2acfd7aa9998c87dabd796a4
diff --git a/metadata/md5-cache/dev-libs/nettle-2.7.1-r1 b/metadata/md5-cache/dev-libs/nettle-2.7.1-r1
index 6f4bbca6dd8a..79cc1e0d9191 100644
--- a/metadata/md5-cache/dev-libs/nettle-2.7.1-r1
+++ b/metadata/md5-cache/dev-libs/nettle-2.7.1-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-3 LGPL-2.1 )
 RDEPEND=gmp? ( dev-libs/gmp ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r17 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/4
 SRC_URI=http://www.lysator.liu.se/~nisse/archive/nettle-2.7.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6b265242e4aa1880993098a80b5ec55a
diff --git a/metadata/md5-cache/dev-libs/nettle-2.7.1-r2 b/metadata/md5-cache/dev-libs/nettle-2.7.1-r2
index 9d428a6dac5d..d1b77fd07661 100644
--- a/metadata/md5-cache/dev-libs/nettle-2.7.1-r2
+++ b/metadata/md5-cache/dev-libs/nettle-2.7.1-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-3 LGPL-2.1 )
 RDEPEND=gmp? ( dev-libs/gmp ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r17 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/4
 SRC_URI=http://www.lysator.liu.se/~nisse/archive/nettle-2.7.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=802f57c1530c6797ed00e14b932127f7
diff --git a/metadata/md5-cache/dev-libs/nettle-2.7.1-r3 b/metadata/md5-cache/dev-libs/nettle-2.7.1-r3
index 9ca0c495738c..96a9b4c180cb 100644
--- a/metadata/md5-cache/dev-libs/nettle-2.7.1-r3
+++ b/metadata/md5-cache/dev-libs/nettle-2.7.1-r3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-3 LGPL-2.1 )
 RDEPEND=gmp? ( dev-libs/gmp[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-r17 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/4
 SRC_URI=http://www.lysator.liu.se/~nisse/archive/nettle-2.7.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0fba703ec0816995a97aa1190ea91401
diff --git a/metadata/md5-cache/dev-libs/nettle-2.7.1-r4 b/metadata/md5-cache/dev-libs/nettle-2.7.1-r4
index 2e0022165a7e..08f7f732640c 100644
--- a/metadata/md5-cache/dev-libs/nettle-2.7.1-r4
+++ b/metadata/md5-cache/dev-libs/nettle-2.7.1-r4
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-3 LGPL-2.1 )
 RDEPEND=gmp? ( dev-libs/gmp: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-r17 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/4
 SRC_URI=http://www.lysator.liu.se/~nisse/archive/nettle-2.7.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=46ab9751cc95c41481eea68c454baccc
diff --git a/metadata/md5-cache/dev-libs/nettle-3.1.1 b/metadata/md5-cache/dev-libs/nettle-3.1.1
index b7144a3bb407..0ce00cfb025b 100644
--- a/metadata/md5-cache/dev-libs/nettle-3.1.1
+++ b/metadata/md5-cache/dev-libs/nettle-3.1.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-3 LGPL-2.1 )
 RDEPEND=gmp? ( dev-libs/gmp: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-r17 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/6
 SRC_URI=http://www.lysator.liu.se/~nisse/archive/nettle-3.1.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=911785873eb01bdf3cd48528206e04b1
diff --git a/metadata/md5-cache/dev-libs/nsgenbind-0.1.1 b/metadata/md5-cache/dev-libs/nsgenbind-0.1.1
index b2da6dab7c07..b34db90f6775 100644
--- a/metadata/md5-cache/dev-libs/nsgenbind-0.1.1
+++ b/metadata/md5-cache/dev-libs/nsgenbind-0.1.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/nsgenbind-0.1.1-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.2.tar.gz -> netsurf-buildsystem-1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ba312b7c92219147dc3f861517c149c3
diff --git a/metadata/md5-cache/dev-libs/nsgenbind-0.1.2-r1 b/metadata/md5-cache/dev-libs/nsgenbind-0.1.2-r1
index 77527d1056d4..5511a79e537a 100644
--- a/metadata/md5-cache/dev-libs/nsgenbind-0.1.2-r1
+++ b/metadata/md5-cache/dev-libs/nsgenbind-0.1.2-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/nsgenbind-0.1.2-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.3.tar.gz -> netsurf-buildsystem-1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a698a61c07b91b125135a033d82796a5
diff --git a/metadata/md5-cache/dev-libs/nspr-4.10.6-r1 b/metadata/md5-cache/dev-libs/nspr-4.10.6-r1
index 56d452f97830..78fdc030caf4 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.10.6-r1
+++ b/metadata/md5-cache/dev-libs/nspr-4.10.6-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.10.6/src/nspr-4.10.6.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=28863b75ef9305ee0a560bf1a51559db
diff --git a/metadata/md5-cache/dev-libs/nspr-4.10.7-r1 b/metadata/md5-cache/dev-libs/nspr-4.10.7-r1
index 1c158763b0f1..c8913f360504 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.10.7-r1
+++ b/metadata/md5-cache/dev-libs/nspr-4.10.7-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.10.7/src/nspr-4.10.7.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b46b8da4edab3a8e12c8b1eb688fc8fd
diff --git a/metadata/md5-cache/dev-libs/nspr-4.10.8 b/metadata/md5-cache/dev-libs/nspr-4.10.8
index 32425dafc8de..2cc7b3845dd2 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.10.8
+++ b/metadata/md5-cache/dev-libs/nspr-4.10.8
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.10.8/src/nspr-4.10.8.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=151b790974ee9c8fa30e87cf6b32c248
diff --git a/metadata/md5-cache/dev-libs/nss-3.17.3 b/metadata/md5-cache/dev-libs/nss-3.17.3
index 50934f7124a4..50e6afbe3ad8 100644
--- a/metadata/md5-cache/dev-libs/nss-3.17.3
+++ b/metadata/md5-cache/dev-libs/nss-3.17.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.10.6-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_3_RTM/src/nss-3.17.3.tar.gz cacert? ( http://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch ) nss-pem? ( https://git.fedorahosted.org/cgit/nss-pem.git/snapshot/nss-pem-015ae754dd9f6fbcd7e52030ec9732eb27fc06a8.tar.bz2 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=89e3ae02bda529c6ae5ac9ea8de05a69
diff --git a/metadata/md5-cache/dev-libs/nss-3.17.4 b/metadata/md5-cache/dev-libs/nss-3.17.4
index 0893cb46c766..a3d81946230a 100644
--- a/metadata/md5-cache/dev-libs/nss-3.17.4
+++ b/metadata/md5-cache/dev-libs/nss-3.17.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.10.6-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_4_RTM/src/nss-3.17.4.tar.gz cacert? ( http://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch ) nss-pem? ( https://git.fedorahosted.org/cgit/nss-pem.git/snapshot/nss-pem-015ae754dd9f6fbcd7e52030ec9732eb27fc06a8.tar.bz2 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=db5750bf79cfa096d6b01da899de3341
diff --git a/metadata/md5-cache/dev-libs/nss-3.18.1 b/metadata/md5-cache/dev-libs/nss-3.18.1
index d839d1c63351..58a9f7f2f384 100644
--- a/metadata/md5-cache/dev-libs/nss-3.18.1
+++ b/metadata/md5-cache/dev-libs/nss-3.18.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.10.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_18_1_RTM/src/nss-3.18.1.tar.gz cacert? ( http://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch ) nss-pem? ( https://git.fedorahosted.org/cgit/nss-pem.git/snapshot/nss-pem-015ae754dd9f6fbcd7e52030ec9732eb27fc06a8.tar.bz2 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f196f049c345ebd3a1b45e9446a4ae04
diff --git a/metadata/md5-cache/dev-libs/nss-3.19 b/metadata/md5-cache/dev-libs/nss-3.19
index a1121e0b56c1..d545d8f3c0f0 100644
--- a/metadata/md5-cache/dev-libs/nss-3.19
+++ b/metadata/md5-cache/dev-libs/nss-3.19
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.10.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_RTM/src/nss-3.19.tar.gz cacert? ( http://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch ) nss-pem? ( https://git.fedorahosted.org/cgit/nss-pem.git/snapshot/nss-pem-015ae754dd9f6fbcd7e52030ec9732eb27fc06a8.tar.bz2 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7f6519313cd4aa1fc536b77a416bf4a3
diff --git a/metadata/md5-cache/dev-libs/nss-3.19.1 b/metadata/md5-cache/dev-libs/nss-3.19.1
index 34b1cb54e814..b4263d29aca8 100644
--- a/metadata/md5-cache/dev-libs/nss-3.19.1
+++ b/metadata/md5-cache/dev-libs/nss-3.19.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/nspr-4.10.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 RESTRICT=test
 SLOT=0
 SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_19_1_RTM/src/nss-3.19.1.tar.gz cacert? ( http://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch ) nss-pem? ( https://git.fedorahosted.org/cgit/nss-pem.git/snapshot/nss-pem-015ae754dd9f6fbcd7e52030ec9732eb27fc06a8.tar.bz2 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b5c8b50de04d0d0cb310cec512d319b5
diff --git a/metadata/md5-cache/dev-libs/oniguruma-5.9.5 b/metadata/md5-cache/dev-libs/oniguruma-5.9.5
index c7f88837331d..ec7d67e3ee7d 100644
--- a/metadata/md5-cache/dev-libs/oniguruma-5.9.5
+++ b/metadata/md5-cache/dev-libs/oniguruma-5.9.5
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~a
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://www.geocities.jp/kosako3/oniguruma/archive/onig-5.9.5.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=fe8f8628528a3fddbb64a0ac462de63d
diff --git a/metadata/md5-cache/dev-libs/openssl-0.9.8z_p5-r1 b/metadata/md5-cache/dev-libs/openssl-0.9.8z_p5-r1
index 74e1ce6e7065..7296c8b59730 100644
--- a/metadata/md5-cache/dev-libs/openssl-0.9.8z_p5-r1
+++ b/metadata/md5-cache/dev-libs/openssl-0.9.8z_p5-r1
@@ -10,5 +10,5 @@ RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=!bindist? ( bindist )
 SLOT=0.9.8
 SRC_URI=mirror://openssl/source/openssl-0.9.8ze.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=74def226a2092ede9932aa93660c5537
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 ba4c463dd0e9..4a7f94be3a54 100644
--- a/metadata/md5-cache/dev-libs/openssl-0.9.8z_p6
+++ b/metadata/md5-cache/dev-libs/openssl-0.9.8z_p6
@@ -10,5 +10,5 @@ RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=!bindist? ( bindist )
 SLOT=0.9.8
 SRC_URI=mirror://openssl/source/openssl-0.9.8zf.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=3d016dc7f872a5446b775a734d62f9d1
diff --git a/metadata/md5-cache/dev-libs/openssl-0.9.8z_p7 b/metadata/md5-cache/dev-libs/openssl-0.9.8z_p7
index 0eec6c4279a7..98265d57a86c 100644
--- a/metadata/md5-cache/dev-libs/openssl-0.9.8z_p7
+++ b/metadata/md5-cache/dev-libs/openssl-0.9.8z_p7
@@ -10,5 +10,5 @@ RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=!bindist? ( bindist )
 SLOT=0.9.8
 SRC_URI=mirror://openssl/source/openssl-0.9.8zg.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=5b3cb1bb190d3cde11ed5c63c5555590
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.1l-r1 b/metadata/md5-cache/dev-libs/openssl-1.0.1l-r1
index d57642b21706..f4510ab06193 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.1l-r1
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.1l-r1
@@ -11,5 +11,5 @@ RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.1l.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	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=cb9afcf129e8e78211ea1ab597fc10ce
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.1m b/metadata/md5-cache/dev-libs/openssl-1.0.1m
index f3fc608d5917..5e34ae5cf399 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.1m
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.1m
@@ -11,5 +11,5 @@ RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64
 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	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=25c3d5a5f65b895ccb75bcd3e7de7c0d
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.1n b/metadata/md5-cache/dev-libs/openssl-1.0.1n
index e5ce6ed80d94..80c641981ab5 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.1n
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.1n
@@ -11,5 +11,5 @@ RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.1n.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	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e84a5577caa7ae71b9718e320417e2f2
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.1o b/metadata/md5-cache/dev-libs/openssl-1.0.1o
index 0b3a57c095c8..94359597cab6 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.1o
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.1o
@@ -11,5 +11,5 @@ RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.1o.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	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4dbf32e88915c3c533238d219080a000
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2-r3 b/metadata/md5-cache/dev-libs/openssl-1.0.2-r3
index 2a244ce5e3d8..5f28050e4ba2 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2-r3
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2-r3
@@ -11,5 +11,5 @@ RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.2.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	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=615ae023d070fa0694b53834694a0c06
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2a b/metadata/md5-cache/dev-libs/openssl-1.0.2a
index 483a22068f1b..5fc73eac89d5 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2a
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2a
@@ -11,5 +11,5 @@ RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.2a.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	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=9aa6dad5826a21ca0b5705c0aa39fb48
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2b b/metadata/md5-cache/dev-libs/openssl-1.0.2b
index 08f9018dbef0..3f5340ea8813 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2b
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2b
@@ -11,5 +11,5 @@ RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.2b.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	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=79b1f14172a4ddd0a700179a678e0e4c
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2c b/metadata/md5-cache/dev-libs/openssl-1.0.2c
index 3234b615d9a9..ea6f868252e7 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2c
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2c
@@ -11,5 +11,5 @@ RDEPEND=gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.2c.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	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e86616486a04bdc2cbc019e058f68c60
diff --git a/metadata/md5-cache/dev-libs/pakchois-0.4-r2 b/metadata/md5-cache/dev-libs/pakchois-0.4-r2
index 134d1fc08591..7a294456cd37 100644
--- a/metadata/md5-cache/dev-libs/pakchois-0.4-r2
+++ b/metadata/md5-cache/dev-libs/pakchois-0.4-r2
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=http://www.manyfish.co.uk/pakchois/pakchois-0.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0d5535319e4b513ae949800f68c5b85f
diff --git a/metadata/md5-cache/dev-libs/popt-1.16-r2 b/metadata/md5-cache/dev-libs/popt-1.16-r2
index b778f7a89e2d..98a9da751f15 100644
--- a/metadata/md5-cache/dev-libs/popt-1.16-r2
+++ b/metadata/md5-cache/dev-libs/popt-1.16-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=nls? ( >=virtual/libintl-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
 SRC_URI=http://rpm5.org/files/popt/popt-1.16.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d2b6ce0811325aca7ea4c182c49e0fc3
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.5.0-r2 b/metadata/md5-cache/dev-libs/protobuf-2.5.0-r2
index 061d897af1e4..3715ec2e0f0b 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.5.0-r2
+++ b/metadata/md5-cache/dev-libs/protobuf-2.5.0-r2
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) 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(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) )
 SLOT=0/8
 SRC_URI=http://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	9a16929c1a6aec7e1c903289983e114c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	9a16929c1a6aec7e1c903289983e114c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=06d576a4bc28a963ccd1bfb6995855c5
diff --git a/metadata/md5-cache/dev-libs/protobuf-2.6.1-r3 b/metadata/md5-cache/dev-libs/protobuf-2.6.1-r3
index f2af357542b1..fcb5e6d9af1b 100644
--- a/metadata/md5-cache/dev-libs/protobuf-2.6.1-r3
+++ b/metadata/md5-cache/dev-libs/protobuf-2.6.1-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Google's Protocol Buffers -- an efficient method of encoding structu
 EAPI=5
 HOMEPAGE=http://code.google.com/p/protobuf/ https://github.com/google/protobuf/
 IUSE=emacs examples java python static-libs vim-syntax 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 python_targets_python2_7 elibc_FreeBSD source java
-KEYWORDS=~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ppc ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~amd64 arm ~arm64 -hppa ~ia64 ~mips ppc ppc64 ~sh ~x86 ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) 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(-)] ) 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(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) )
 SLOT=0/9
 SRC_URI=https://github.com/google/protobuf/releases/download/2.6.1/protobuf-2.6.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	9a16929c1a6aec7e1c903289983e114c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3b2a8cbe9fda82a32c1673f03a356a46
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	elisp-common	9a16929c1a6aec7e1c903289983e114c	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=e48bfaef03c9d31460a68a6a71b3fb79
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.0.2-r1 b/metadata/md5-cache/dev-libs/protobuf-c-1.0.2-r1
index 095ff9ae2720..174512215c55 100644
--- a/metadata/md5-cache/dev-libs/protobuf-c-1.0.2-r1
+++ b/metadata/md5-cache/dev-libs/protobuf-c-1.0.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=code generator and runtime libraries to use Protocol Buffers (protob
 EAPI=5
 HOMEPAGE=https://github.com/protobuf-c/protobuf-c/
 IUSE=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=amd64 ~arm ppc ppc64 x86
+KEYWORDS=amd64 arm ppc ppc64 x86
 LICENSE=BSD-2
 RDEPEND=>=dev-libs/protobuf-2.5.0-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(-)?]
 SLOT=0
 SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.0.2/protobuf-c-1.0.2.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=bf42ee095b8783f10838c96243881754
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=82d429e8519fefa2ecb9cf5859375d38
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.1.1 b/metadata/md5-cache/dev-libs/protobuf-c-1.1.1
index 8818567fe5a9..6cf286c82c35 100644
--- a/metadata/md5-cache/dev-libs/protobuf-c-1.1.1
+++ b/metadata/md5-cache/dev-libs/protobuf-c-1.1.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=dev-libs/protobuf-2.6.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(-)?]
 SLOT=0
 SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.1.1/protobuf-c-1.1.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c4df28bd31daae5d7b61e761e41aecfd
diff --git a/metadata/md5-cache/dev-libs/qjson-0.8.1-r1 b/metadata/md5-cache/dev-libs/qjson-0.8.1-r1
index 40094e4df074..8bb4f54fe50d 100644
--- a/metadata/md5-cache/dev-libs/qjson-0.8.1-r1
+++ b/metadata/md5-cache/dev-libs/qjson-0.8.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtcore-4.8.6: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(-)?]
 SLOT=0
 SRC_URI=mirror://github/flavio/qjson/qjson-0.8.1.tar.bz2
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e40a5f882ac4fcf30df70797685f88f1
diff --git a/metadata/md5-cache/dev-libs/re2-0_p20130115-r1 b/metadata/md5-cache/dev-libs/re2-0_p20130115-r1
index 3edecc4a004e..75191de55356 100644
--- a/metadata/md5-cache/dev-libs/re2-0_p20130115-r1
+++ b/metadata/md5-cache/dev-libs/re2-0_p20130115-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://re2.googlecode.com/files/re2-20130115.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2ffc29c208e8d6ab6cba07f5a48aee6c
diff --git a/metadata/md5-cache/dev-libs/re2-0_p20130712 b/metadata/md5-cache/dev-libs/re2-0_p20130712
index 3ffa3957dff5..0c5e625893de 100644
--- a/metadata/md5-cache/dev-libs/re2-0_p20130712
+++ b/metadata/md5-cache/dev-libs/re2-0_p20130712
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://re2.googlecode.com/files/re2-20130712.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d8ae9db134234f47af1b70d8d11ecf9b
diff --git a/metadata/md5-cache/dev-libs/re2-0_p20140304 b/metadata/md5-cache/dev-libs/re2-0_p20140304
index 890507b8e5de..abbf661ba331 100644
--- a/metadata/md5-cache/dev-libs/re2-0_p20140304
+++ b/metadata/md5-cache/dev-libs/re2-0_p20140304
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD
 SLOT=0/0.20140110
 SRC_URI=http://re2.googlecode.com/files/re2-20140304.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=27152353d577150c239998c9626433fd
diff --git a/metadata/md5-cache/dev-libs/serd-0.20.0 b/metadata/md5-cache/dev-libs/serd-0.20.0
index c3ae0b7bc702..32b36f8f6ee2 100644
--- a/metadata/md5-cache/dev-libs/serd-0.20.0
+++ b/metadata/md5-cache/dev-libs/serd-0.20.0
@@ -4,9 +4,9 @@ DESCRIPTION=Library for RDF syntax which supports reading and writing Turtle and
 EAPI=4
 HOMEPAGE=http://drobilla.net/software/serd/
 IUSE=doc static-libs test
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=ISC
 SLOT=0
 SRC_URI=http://download.drobilla.net/serd-0.20.0.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
-_md5_=cafb1c08aa2ca949047726afdb485d94
+_md5_=718c103a8a3db5e128312b222daa88a8
diff --git a/metadata/md5-cache/dev-libs/sni-qt-0.2.6-r1 b/metadata/md5-cache/dev-libs/sni-qt-0.2.6-r1
index 40a85cb9848d..8798ccc3a56b 100644
--- a/metadata/md5-cache/dev-libs/sni-qt-0.2.6-r1
+++ b/metadata/md5-cache/dev-libs/sni-qt-0.2.6-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=dev-libs/libdbusmenu-qt[qt4,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(-)?] >=dev-qt/qtcore-4.8.6: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(-)?] >=dev-qt/qtdbus-4.8.6: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(-)?] >=dev-qt/qtgui-4.8.6: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(-)?]
 SLOT=0
 SRC_URI=https://launchpad.net/sni-qt/trunk/0.2.6/+download/sni-qt-0.2.6.tar.bz2
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=af7c82cd25b267015b27eb4b230ff110
diff --git a/metadata/md5-cache/dev-libs/udis86-1.7-r2 b/metadata/md5-cache/dev-libs/udis86-1.7-r2
index 13a035ee5757..cda9d517cfa8 100644
--- a/metadata/md5-cache/dev-libs/udis86-1.7-r2
+++ b/metadata/md5-cache/dev-libs/udis86-1.7-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/udis86/udis86-1.7.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=df0d1e02b585722a338e6cfd76efae01
diff --git a/metadata/md5-cache/dev-libs/udis86-1.7.2 b/metadata/md5-cache/dev-libs/udis86-1.7.2
index ae0a31ade200..11ae565c65b1 100644
--- a/metadata/md5-cache/dev-libs/udis86-1.7.2
+++ b/metadata/md5-cache/dev-libs/udis86-1.7.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/udis86/udis86-1.7.2.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=71d75929fcafe3bb03814b5bd1a89e2a
diff --git a/metadata/md5-cache/dev-libs/ustr-1.0.4-r5 b/metadata/md5-cache/dev-libs/ustr-1.0.4-r5
index 5aab443c37d8..aab88bc832cb 100644
--- a/metadata/md5-cache/dev-libs/ustr-1.0.4-r5
+++ b/metadata/md5-cache/dev-libs/ustr-1.0.4-r5
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ~mips x86
 LICENSE=|| ( BSD-2 MIT LGPL-2 )
 SLOT=0
 SRC_URI=ftp://ftp.and.org/pub/james/ustr/1.0.4/ustr-1.0.4.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7f036a6b6977acfd59d86ffe8d6d5f91
diff --git a/metadata/md5-cache/dev-libs/wayland-1.2.1-r1 b/metadata/md5-cache/dev-libs/wayland-1.2.1-r1
index bd4dec9daa89..20decb917f58 100644
--- a/metadata/md5-cache/dev-libs/wayland-1.2.1-r1
+++ b/metadata/md5-cache/dev-libs/wayland-1.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3[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(-)?] >=virtual/libffi-3.0.13-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
 SRC_URI=http://wayland.freedesktop.org/releases/wayland-1.2.1.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6a9b5a6c8ce60fe5187229ae20f9045f
diff --git a/metadata/md5-cache/dev-libs/wayland-1.3.0 b/metadata/md5-cache/dev-libs/wayland-1.3.0
index 237ea11e4372..9732df5aac6f 100644
--- a/metadata/md5-cache/dev-libs/wayland-1.3.0
+++ b/metadata/md5-cache/dev-libs/wayland-1.3.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3[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(-)?] >=virtual/libffi-3.0.13-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
 SRC_URI=http://wayland.freedesktop.org/releases/wayland-1.3.0.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=865bcce2857c7f3414030ea473010640
diff --git a/metadata/md5-cache/dev-libs/wayland-1.4.0 b/metadata/md5-cache/dev-libs/wayland-1.4.0
index b1f577119436..d8d4442012ba 100644
--- a/metadata/md5-cache/dev-libs/wayland-1.4.0
+++ b/metadata/md5-cache/dev-libs/wayland-1.4.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3[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(-)?] >=virtual/libffi-3.0.13-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
 SRC_URI=http://wayland.freedesktop.org/releases/wayland-1.4.0.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=64c7ffa4d8adade24a8c778ca349a29e
diff --git a/metadata/md5-cache/dev-libs/wayland-1.5.0 b/metadata/md5-cache/dev-libs/wayland-1.5.0
index 687e4793443c..052454fca9c8 100644
--- a/metadata/md5-cache/dev-libs/wayland-1.5.0
+++ b/metadata/md5-cache/dev-libs/wayland-1.5.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3[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(-)?] >=virtual/libffi-3.0.13-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
 SRC_URI=http://wayland.freedesktop.org/releases/wayland-1.5.0.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a49323259ad0a3c8c67f23290edd9d34
diff --git a/metadata/md5-cache/dev-libs/wayland-1.6.0 b/metadata/md5-cache/dev-libs/wayland-1.6.0
index e935588e9b32..5761e34f4539 100644
--- a/metadata/md5-cache/dev-libs/wayland-1.6.0
+++ b/metadata/md5-cache/dev-libs/wayland-1.6.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3:=[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(-)?] >=virtual/libffi-3.0.13-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
 SRC_URI=http://wayland.freedesktop.org/releases/wayland-1.6.0.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=09d8ae6120e72853c6942ceae7a8df65
diff --git a/metadata/md5-cache/dev-libs/wayland-1.6.1 b/metadata/md5-cache/dev-libs/wayland-1.6.1
index 66fac57c09d4..2c3aa0909826 100644
--- a/metadata/md5-cache/dev-libs/wayland-1.6.1
+++ b/metadata/md5-cache/dev-libs/wayland-1.6.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3:=[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(-)?] >=virtual/libffi-3.0.13-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
 SRC_URI=http://wayland.freedesktop.org/releases/wayland-1.6.1.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=cc972c5ee22eb078b918775a30f27e94
diff --git a/metadata/md5-cache/dev-libs/wayland-1.7.0 b/metadata/md5-cache/dev-libs/wayland-1.7.0
index 24f80ce4e587..16a5ddbcc578 100644
--- a/metadata/md5-cache/dev-libs/wayland-1.7.0
+++ b/metadata/md5-cache/dev-libs/wayland-1.7.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3:=[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(-)?] >=virtual/libffi-3.0.13-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
 SRC_URI=http://wayland.freedesktop.org/releases/wayland-1.7.0.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2d66fbda6c48d9740e4a319347a0cc64
diff --git a/metadata/md5-cache/dev-libs/yajl-1.0.11-r1 b/metadata/md5-cache/dev-libs/yajl-1.0.11-r1
index fa7a27ca1040..24e87329d35a 100644
--- a/metadata/md5-cache/dev-libs/yajl-1.0.11-r1
+++ b/metadata/md5-cache/dev-libs/yajl-1.0.11-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://github.com/lloyd/yajl/tarball/1.0.11 -> yajl-1.0.11.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
 _md5_=244907432d81b2501ab77e34cfce88d2
diff --git a/metadata/md5-cache/dev-libs/yajl-2.0.4-r1 b/metadata/md5-cache/dev-libs/yajl-2.0.4-r1
index 9a382095086e..ef573ee9e075 100644
--- a/metadata/md5-cache/dev-libs/yajl-2.0.4-r1
+++ b/metadata/md5-cache/dev-libs/yajl-2.0.4-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://github.com/lloyd/yajl/tarball/2.0.4 -> yajl-2.0.4.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=5327bc87873a6e328604d659a76d5935
diff --git a/metadata/md5-cache/dev-libs/yajl-2.0.4-r2 b/metadata/md5-cache/dev-libs/yajl-2.0.4-r2
index c8be3cd4b4a9..d255470508c9 100644
--- a/metadata/md5-cache/dev-libs/yajl-2.0.4-r2
+++ b/metadata/md5-cache/dev-libs/yajl-2.0.4-r2
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://github.com/lloyd/yajl/tarball/2.0.4 -> yajl-2.0.4.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
 _md5_=416f8ad5e3ebb32110e6ff695f6e0742
diff --git a/metadata/md5-cache/dev-libs/yajl-2.0.4-r3 b/metadata/md5-cache/dev-libs/yajl-2.0.4-r3
index 685e39375030..f7ad419eccc9 100644
--- a/metadata/md5-cache/dev-libs/yajl-2.0.4-r3
+++ b/metadata/md5-cache/dev-libs/yajl-2.0.4-r3
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-f
 LICENSE=BSD
 SLOT=0
 SRC_URI=http://github.com/lloyd/yajl/tarball/2.0.4 -> yajl-2.0.4.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
 _md5_=55a3bec21f7f4fae97cbaab757c1438d
diff --git a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r1 b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r1
index a39b4bc51a1c..1b0b5afa615f 100644
--- a/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r1
+++ b/metadata/md5-cache/dev-lua/LuaBitOp-1.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1.5-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(-)?]
 SLOT=0
 SRC_URI=http://bitop.luajit.org/download/LuaBitOp-1.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2550ed08f5d8b57f37bb1f9b46d7e70b
diff --git a/metadata/md5-cache/dev-lua/lgi-0.9.0 b/metadata/md5-cache/dev-lua/lgi-0.9.0
index babd274c3839..cd958fa4db44 100644
--- a/metadata/md5-cache/dev-lua/lgi-0.9.0
+++ b/metadata/md5-cache/dev-lua/lgi-0.9.0
@@ -4,10 +4,10 @@ DESCRIPTION=Lua bindings using gobject-introspection
 EAPI=4
 HOMEPAGE=http://github.com/pavouk/lgi
 IUSE=examples test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 arm ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1 dev-libs/gobject-introspection dev-libs/glib virtual/libffi
 SLOT=0
 SRC_URI=https://github.com/pavouk/lgi/archive/0.9.0.tar.gz -> lgi-0.9.0.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=797d8df1af82a22ec48dbc66bec9da3b
+_md5_=e4437f1eb2497919b04809bfa4e9f19b
diff --git a/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r1 b/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r1
index 13f6d1940f9d..13815926397d 100644
--- a/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r1
+++ b/metadata/md5-cache/dev-lua/luaexpat-1.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-lang/lua-5.1.5-r2[deprecated,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(-)?] >=dev-libs/expat-2.1.0-r3[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
 SRC_URI=http://matthewwild.co.uk/projects/luaexpat/luaexpat-1.3.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e574785c433618ea0fb333b38da776e9
diff --git a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r3 b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r3
index 428e55323e4d..d804b85850e0 100644
--- a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r3
+++ b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/lua-5.1.5-r2[deprecated,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/diegonehab/luasocket/archive/v3.0-rc1.tar.gz -> luasocket-3.0_rc1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=13fa38330c66b48b43b96f6fa5d504b3
diff --git a/metadata/md5-cache/dev-perl/Acme-Damn-0.60.0 b/metadata/md5-cache/dev-perl/Acme-Damn-0.60.0
new file mode 100644
index 000000000000..27493e4d350d
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Acme-Damn-0.60.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Exception virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=Module, that 'unblesses' Perl objects
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Acme-Damn/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/I/IB/IBB/Acme-Damn-0.06.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=b2438646053477c6cd9f3748c8ee0955
diff --git a/metadata/md5-cache/dev-perl/Gentoo-PerlMod-Version-0.7.0 b/metadata/md5-cache/dev-perl/Gentoo-PerlMod-Version-0.7.0
index 3713c6835453..67151c424583 100644
--- a/metadata/md5-cache/dev-perl/Gentoo-PerlMod-Version-0.7.0
+++ b/metadata/md5-cache/dev-perl/Gentoo-PerlMod-Version-0.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=Convert arbitrary Perl Modules' versions into normalised Gentoo vers
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Gentoo-PerlMod-Version/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper dev-perl/List-MoreUtils dev-perl/Sub-Exporter-Progressive >=virtual/perl-version-0.770.0 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/K/KE/KENTNL/Gentoo-PerlMod-Version-0.7.0.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=ed6d7a9d1c4f09b46e52b59eb722de3c
+_md5_=d5edbcf5b35bb3e1d90d8a2b58f4508d
diff --git a/metadata/md5-cache/dev-perl/Guard-1.23.0 b/metadata/md5-cache/dev-perl/Guard-1.23.0
new file mode 100644
index 000000000000..ddf561e00216
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Guard-1.23.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
+DESCRIPTION=Safe cleanup blocks
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/Guard/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/ML/MLEHMANN/Guard-1.023.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=58a84102c360fc5ccb27eac2d6215552
diff --git a/metadata/md5-cache/dev-perl/HTML-Format-2.110.0 b/metadata/md5-cache/dev-perl/HTML-Format-2.110.0
new file mode 100644
index 000000000000..33783dc1e091
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-Format-2.110.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode dev-perl/Font-AFM dev-perl/HTML-Tree virtual/perl-IO virtual/perl-parent >=dev-perl/Module-Build-0.360.100 test? ( dev-perl/File-Slurp virtual/perl-File-Spec virtual/perl-Scalar-List-Utils >=virtual/perl-Test-Simple-0.960.0 ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=HTML Formatter
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/HTML-Format/
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper virtual/perl-Encode dev-perl/Font-AFM dev-perl/HTML-Tree virtual/perl-IO virtual/perl-parent dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/N/NI/NIGELM/HTML-Format-2.11.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=e7f43497cd01aff52a944abf730aec8f
diff --git a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.14 b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.140.0
similarity index 95%
rename from metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.14
rename to metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.140.0
index b83f5c5ab069..b5d7586acc74 100644
--- a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.14
+++ b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.140.0
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-0.14.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=2a63a98a00598b49a58a65295f87a4f0
+_md5_=112b128bed76b6972c90c44330521717
diff --git a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0 b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0
new file mode 100644
index 000000000000..b5d0c02b6845
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-0.150.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-perl/HTML-Format-2 dev-perl/HTML-Tree dev-perl/URI >=dev-perl/Module-Build-0.380.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=HTML to text conversion with links as footnotes
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/HTML-FormatText-WithLinks/
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/HTML-Format-2 dev-perl/HTML-Tree dev-perl/URI dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/ST/STRUAN/HTML-FormatText-WithLinks-0.15.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=1499b282cb8f657aaa6a58844056dc01
diff --git a/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.60.0 b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.60.0
new file mode 100644
index 000000000000..41926714e0be
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-FormatText-WithLinks-AndTables-0.60.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-perl/HTML-Format dev-perl/HTML-FormatText-WithLinks dev-perl/HTML-Tree virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=Converts HTML to text with tables intact
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/HTML-FormatText-WithLinks-AndTables/
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/HTML-Format dev-perl/HTML-FormatText-WithLinks dev-perl/HTML-Tree dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DA/DALEEVANS/HTML-FormatText-WithLinks-AndTables-0.06.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=d0b385c616d8a1693c34c6ad2f1c06da
diff --git a/metadata/md5-cache/dev-perl/HTML-Mason-1.510.0 b/metadata/md5-cache/dev-perl/HTML-Mason-1.510.0
deleted file mode 100644
index 6fdea3c27996..000000000000
--- a/metadata/md5-cache/dev-perl/HTML-Mason-1.510.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!modperl? ( dev-perl/CGI ) modperl? ( www-apache/libapreq2 >=www-apache/mod_perl-2 ) >=dev-perl/Params-Validate-0.7 >=dev-perl/Class-Container-0.08 >=dev-perl/Exception-Class-1.15 dev-perl/HTML-Parser virtual/perl-Scalar-List-Utils virtual/perl-File-Spec >=dev-perl/Cache-Cache-1.01 dev-perl/Log-Any dev-perl/Module-Build test? ( dev-perl/Test-Deep ) modperl? ( =www-servers/apache-2* ) dev-lang/perl:=[-build(-)]
-DESCRIPTION=A HTML development and delivery Perl Module
-EAPI=5
-HOMEPAGE=http://www.masonhq.com/ http://search.cpan.org/dist/HTML-Mason/
-IUSE=modperl test modperl
-KEYWORDS=amd64 ppc x86
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=!modperl? ( dev-perl/CGI ) modperl? ( www-apache/libapreq2 >=www-apache/mod_perl-2 ) >=dev-perl/Params-Validate-0.7 >=dev-perl/Class-Container-0.08 >=dev-perl/Exception-Class-1.15 dev-perl/HTML-Parser virtual/perl-Scalar-List-Utils virtual/perl-File-Spec >=dev-perl/Cache-Cache-1.01 dev-perl/Log-Any modperl? ( =www-servers/apache-2* ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://cpan/authors/id/J/JS/JSWARTZ/HTML-Mason-1.51.tar.gz
-_eclasses_=depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=546739c126688a7c54b24bf1e8cbf1c7
diff --git a/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0 b/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
new file mode 100644
index 000000000000..f1647f1f06de
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-Mason-1.560.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=!modperl? ( >=dev-perl/CGI-2.460.0 ) modperl? ( www-apache/libapreq2 >=www-apache/mod_perl-2 ) >=dev-perl/Cache-Cache-1 >=dev-perl/Class-Container-0.70.0 >=dev-perl/Exception-Class-1.150.0 virtual/perl-File-Spec dev-perl/HTML-Parser >=dev-perl/Log-Any-0.80.0 >=dev-perl/Params-Validate-0.70.0 virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker test? ( >=virtual/perl-Test-Simple-0.880.0 dev-perl/Test-Deep ) modperl? ( =www-servers/apache-2* ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=A HTML development and delivery Perl Module
+EAPI=5
+HOMEPAGE=http://www.masonhq.com/ http://search.cpan.org/dist/HTML-Mason/
+IUSE=modperl test modperl
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=!modperl? ( >=dev-perl/CGI-2.460.0 ) modperl? ( www-apache/libapreq2 >=www-apache/mod_perl-2 ) >=dev-perl/Cache-Cache-1 >=dev-perl/Class-Container-0.70.0 >=dev-perl/Exception-Class-1.150.0 virtual/perl-File-Spec dev-perl/HTML-Parser >=dev-perl/Log-Any-0.80.0 >=dev-perl/Params-Validate-0.70.0 virtual/perl-Scalar-List-Utils modperl? ( =www-servers/apache-2* ) dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/HTML-Mason-1.56.tar.gz
+_eclasses_=depend.apache	1a38534d3f755d1ab1d92ce120bd7dbd	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=d7cc1d97bb9ecc131b225f764fa13a6d
diff --git a/metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0 b/metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0
new file mode 100644
index 000000000000..1f1a0b11f375
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-Mason-PSGIHandler-0.530.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-perl/CGI-PSGI dev-perl/HTML-Mason >=virtual/perl-ExtUtils-MakeMaker-6.300.0 test? ( dev-perl/Plack virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=PSGI handler for HTML::Mason
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/HTML-Mason-PSGIHandler/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/CGI-PSGI dev-perl/HTML-Mason dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RU/RUZ/HTML-Mason-PSGIHandler-0.53.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=cac1f6ba80a9e9933ce4cc9eaceb5323
diff --git a/metadata/md5-cache/dev-perl/HTML-Packer-2.0.0 b/metadata/md5-cache/dev-perl/HTML-Packer-2.0.0
new file mode 100644
index 000000000000..241e4ebc1dff
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-Packer-2.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-perl/Regexp-RegGrp-1.1.1_rc >=virtual/perl-ExtUtils-MakeMaker-6.590.0 test? ( virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=Another HTML code cleaner
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/HTML-Packer/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/Regexp-RegGrp-1.1.1_rc dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/L/LE/LEEJO/HTML-Packer-2.00.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=bd301b283f8d8cc68bcbdb6b11e8f506
diff --git a/metadata/md5-cache/dev-perl/HTML-Strip-2.90.0 b/metadata/md5-cache/dev-perl/HTML-Strip-2.90.0
new file mode 100644
index 000000000000..67594f4756df
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-Strip-2.90.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/perl-Carp virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Exception virtual/perl-Test-Simple ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=Extension for stripping HTML markup from text
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/HTML-Strip/
+IUSE=test
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/K/KI/KILINRAX/HTML-Strip-2.09.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=e30b48fe45a251a16462fdbb36136f50
diff --git a/metadata/md5-cache/dev-perl/HTML-TableExtract-2.130.0 b/metadata/md5-cache/dev-perl/HTML-TableExtract-2.130.0
new file mode 100644
index 000000000000..2a596716fa5a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-TableExtract-2.130.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-perl/HTML-Element-Extended-1.160.0 dev-perl/HTML-Parser virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=[-build(-)]
+DESCRIPTION=The Perl Table-Extract Module
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/HTML-TableExtract/
+KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~x86 ~x86-linux
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/HTML-Element-Extended-1.160.0 dev-perl/HTML-Parser dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/M/MS/MSISK/HTML-TableExtract-2.13.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=9b6c705aa61734763baec91bb3c844b2
diff --git a/metadata/md5-cache/dev-perl/HTML-TableParser-0.400.0 b/metadata/md5-cache/dev-perl/HTML-TableParser-0.400.0
new file mode 100644
index 000000000000..9ef27dc9d35f
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/HTML-TableParser-0.400.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-perl/HTML-Parser-3.260.0 >=virtual/perl-ExtUtils-MakeMaker-6.590.0 virtual/perl-CPAN-Meta test? ( >=virtual/perl-Test-Simple-0.320.0 dev-perl/Test-Pod dev-perl/Test-Pod-Coverage ) dev-lang/perl:=[-build(-)]
+DESCRIPTION=Extract data from an HTML table
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/HTML-TableParser/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=dev-perl/HTML-Parser-3.260.0 dev-lang/perl:=[-build(-)]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/D/DJ/DJERIUS/HTML-TableParser-0.40.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_md5_=f639b1bb148061cabd6410fd01083e06
diff --git a/metadata/md5-cache/dev-perl/Sub-Exporter-Progressive-0.1.11 b/metadata/md5-cache/dev-perl/Sub-Exporter-Progressive-0.1.11
index db202dd0c513..aa065fdd2385 100644
--- a/metadata/md5-cache/dev-perl/Sub-Exporter-Progressive-0.1.11
+++ b/metadata/md5-cache/dev-perl/Sub-Exporter-Progressive-0.1.11
@@ -3,10 +3,10 @@ DEPEND=dev-perl/Sub-Exporter >=virtual/perl-ExtUtils-MakeMaker-6.300.0 dev-lang/
 DESCRIPTION=Only use Sub::Exporter if you need it
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/Sub-Exporter-Progressive/
-KEYWORDS=~alpha amd64 arm ~hppa ppc ~ppc64 x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/Sub-Exporter dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FREW/Sub-Exporter-Progressive-0.001011.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=1b1814ca5b1f6d99bcc6cc35becf011c
+_md5_=6e1194e022dc6728546e3d6024e35185
diff --git a/metadata/md5-cache/dev-php/pecl-mongo-1.6.3 b/metadata/md5-cache/dev-php/pecl-mongo-1.6.3
index c8b13302a598..c50cc548d15a 100644
--- a/metadata/md5-cache/dev-php/pecl-mongo-1.6.3
+++ b/metadata/md5-cache/dev-php/pecl-mongo-1.6.3
@@ -4,11 +4,11 @@ DESCRIPTION=MongoDB database driver
 EAPI=5
 HOMEPAGE=http://pecl.php.net/mongo
 IUSE=php_targets_php5-6 php_targets_php5-5 php_targets_php5-4
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=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/mongo-1.6.3.tgz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	php-ext-pecl-r2	de1308bcf4fef59a8ee8793efc7c3051	php-ext-source-r2	b4d5827d04ab9f22f094e1ecab1df639	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=9798b224154418f1c696f18bb307b507
+_md5_=5821a50e9eb10f62e25101a748b2bbde
diff --git a/metadata/md5-cache/dev-python/alabaster-0.7.6 b/metadata/md5-cache/dev-python/alabaster-0.7.6
new file mode 100644
index 000000000000..5616554e8603
--- /dev/null
+++ b/metadata/md5-cache/dev-python/alabaster-0.7.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[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=A configurable sidebar-enabled Sphinx theme
+EAPI=5
+HOMEPAGE=https://github.com/bitprophet/alabaster
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
+LICENSE=BSD
+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 ) 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=mirror://pypi/a/alabaster/alabaster-0.7.6.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=d5f9bf1b814711b57f2d6fe97c860e85
diff --git a/metadata/md5-cache/dev-python/algopy-0.5.3 b/metadata/md5-cache/dev-python/algopy-0.5.3
new file mode 100644
index 000000000000..60c03a91a254
--- /dev/null
+++ b/metadata/md5-cache/dev-python/algopy-0.5.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install 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(-)] sci-libs/scipy[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/nose[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=Taylor Arithmetic Computation and Algorithmic Differentiation
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/algopy http://packages.python.org/algopy
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+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(-)] sci-libs/scipy[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
+SRC_URI=mirror://pypi/a/algopy/algopy-0.5.3.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=542cf1b25dcb21a1c6c34300b312a52e
diff --git a/metadata/md5-cache/dev-python/foolscap-0.7.0 b/metadata/md5-cache/dev-python/foolscap-0.7.0
index cb101751f45e..8172b3b8c741 100644
--- a/metadata/md5-cache/dev-python/foolscap-0.7.0
+++ b/metadata/md5-cache/dev-python/foolscap-0.7.0
@@ -4,11 +4,11 @@ DESCRIPTION=RPC protocol for Twisted
 EAPI=5
 HOMEPAGE=http://foolscap.lothar.com/trac http://pypi.python.org/pypi/foolscap
 IUSE=doc +ssl test python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/twisted-core-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/twisted-web-2.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ssl? ( dev-python/pyopenssl[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://foolscap.lothar.com/releases/foolscap-0.7.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=97421089fc4912a2f0b8bb80e7b721d3
+_md5_=ff2dd8919b8f9045a67cc2ce37ece2dd
diff --git a/metadata/md5-cache/dev-python/gmpy-2.0.4 b/metadata/md5-cache/dev-python/gmpy-2.0.4
index c2ea5b0c474b..8f8a104ad21b 100644
--- a/metadata/md5-cache/dev-python/gmpy-2.0.4
+++ b/metadata/md5-cache/dev-python/gmpy-2.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for GMP, MPC, MPFR and MPIR libraries
 EAPI=5
 HOMEPAGE=http://code.google.com/p/gmpy/
 IUSE=doc mpir python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/mpc-1.0.2 >=dev-libs/mpfr-3.1.2 !mpir? ( dev-libs/gmp ) mpir? ( sci-libs/mpir ) 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=2
 SRC_URI=mirror://pypi/g/gmpy2/gmpy2-2.0.4.zip
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=8fa9720f9fe4d3901a3c6fd8fd7627a6
+_md5_=aebadcae2f09ad772ec50311b7af1c3b
diff --git a/metadata/md5-cache/dev-python/hacking-0.10.2 b/metadata/md5-cache/dev-python/hacking-0.10.2
index e03a348f448e..852fd7f638ac 100644
--- a/metadata/md5-cache/dev-python/hacking-0.10.2
+++ b/metadata/md5-cache/dev-python/hacking-0.10.2
@@ -4,11 +4,11 @@ DESCRIPTION=A client for the OpenStack Nova API
 EAPI=5
 HOMEPAGE=https://github.com/openstack-dev/hacking
 IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=~dev-python/pep8-1.5.7[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/pyflakes-0.8.1[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/flake8-2.2.5[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/mccabe-0.2.1[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/six-1.7.0[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
 SRC_URI=mirror://pypi/h/hacking/hacking-0.10.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=0b36e01809b39b016193f5901039c146
+_md5_=8e0f2bbc0d9340d14728597cc56a1020
diff --git a/metadata/md5-cache/dev-python/humanfriendly-1.29 b/metadata/md5-cache/dev-python/humanfriendly-1.29
new file mode 100644
index 000000000000..78b007ccad86
--- /dev/null
+++ b/metadata/md5-cache/dev-python/humanfriendly-1.29
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)] 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=Human friendly output for text interfaces using Python
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/humanfriendly https://humanfriendly.readthedocs.org
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=mirror://pypi/h/humanfriendly/humanfriendly-1.29.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=ee7a47be6f37fe7736bcf1045794f76e
diff --git a/metadata/md5-cache/dev-python/natsort-3.2.0 b/metadata/md5-cache/dev-python/hypothesis-1.6.2
similarity index 89%
rename from metadata/md5-cache/dev-python/natsort-3.2.0
rename to metadata/md5-cache/dev-python/hypothesis-1.6.2
index 8dcd1a203f5f..932e469aebc7 100644
--- a/metadata/md5-cache/dev-python/natsort-3.2.0
+++ b/metadata/md5-cache/dev-python/hypothesis-1.6.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/setuptools[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(-)] 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(-)]
-DESCRIPTION=Natural sorting for Python
+DESCRIPTION=A library for property based testing
 EAPI=5
-HOMEPAGE=https://pypi.python.org/pypi/natsort
+HOMEPAGE=https://github.com/DRMacIver/hypothesis
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~ia64 ~x86
-LICENSE=MIT
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
 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 ) 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/n/natsort/natsort-3.2.0.tar.gz
+SRC_URI=mirror://pypi/h/hypothesis/hypothesis-1.6.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=34366c3d489c7919490b8b7632a051ee
+_md5_=062630a854d966fbb6695cc39587ec65
diff --git a/metadata/md5-cache/dev-python/ipython-2.2.0-r1 b/metadata/md5-cache/dev-python/ipython-2.2.0-r1
index ad1a2228a5b7..10c974f528d1 100644
--- a/metadata/md5-cache/dev-python/ipython-2.2.0-r1
+++ b/metadata/md5-cache/dev-python/ipython-2.2.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced interactive shell for Python
 EAPI=5
 HOMEPAGE=http://ipython.org/
 IUSE=doc examples matplotlib mongodb notebook nbconvert octave qt4 +smp test wxwidgets python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 test
-KEYWORDS=amd64 ~arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-python/decorator[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/pexpect[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/pyparsing[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/simplegeneric[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(-)] matplotlib? ( dev-python/matplotlib[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(-)] ) mongodb? ( dev-python/pymongo[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(-)] ) octave? ( dev-python/oct2py[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(-)] ) smp? ( >=dev-python/pyzmq-2.1.11[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(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) notebook? ( >=www-servers/tornado-3.1[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/pygments[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/pyzmq-2.1.11[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/jinja[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-libs/mathjax ) nbconvert? ( >=app-text/pandoc-1.12.1 dev-python/pygments[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/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(-)] dev-python/jinja[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(-)] ) qt4? ( || ( dev-python/PyQt4[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/pyside[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/pygments[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/pyzmq-2.1.11[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[readline,sqlite] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[readline,sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite] ) >=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/i/ipython/ipython-2.2.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2a73288f6d99ad9146bc72d322e502b4
+_md5_=e9c97f4a614c8e55f1300feccc739a68
diff --git a/metadata/md5-cache/dev-python/moto-0.4.3 b/metadata/md5-cache/dev-python/moto-0.4.3
new file mode 100644
index 000000000000..cadcb61681b1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/moto-0.4.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)] 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=Mock library for boto
+EAPI=5
+HOMEPAGE=https://github.com/spulec/moto
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/jinja[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/boto-2.20.0[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/dicttoxml[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/flask[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/httpretty-0.6.1[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/requests[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/xmltodict[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/six[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/werkzeug[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
+SRC_URI=mirror://pypi/m/moto/moto-0.4.3.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=f45fb7dbf2763034e89833ccc8635c9d
diff --git a/metadata/md5-cache/dev-python/natsort-4.0.1 b/metadata/md5-cache/dev-python/natsort-4.0.1
new file mode 100644
index 000000000000..555616955932
--- /dev/null
+++ b/metadata/md5-cache/dev-python/natsort-4.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[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(-)] test? ( dev-python/pytest[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(-)] dev-python/hypothesis[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(-)] dev-python/pytest-cov[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(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) python_targets_pypy? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) ) 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(-)]
+DESCRIPTION=Natural sorting for Python
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/natsort
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+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 ) 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/n/natsort/natsort-4.0.1.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=483e5f5673f5482ba402349cd6bdd8c7
diff --git a/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.0 b/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.0
new file mode 100644
index 000000000000..497198dbe2e2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ndg-httpsclient-0.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pyopenssl[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(-)] dev-python/setuptools[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(-)] 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(-)]
+DESCRIPTION=Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL
+EAPI=5
+HOMEPAGE=https://github.com/cedadev/ndg_httpsclient/ https://pypi.python.org/pypi/ndg-httpsclient
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=dev-python/pyopenssl[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(-)] 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/n/ndg-httpsclient/ndg_httpsclient-0.4.0.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=f8af0f16c9ddf62207cda16d1d7696a4
diff --git a/metadata/md5-cache/dev-python/neovim-python-client-0.0.36 b/metadata/md5-cache/dev-python/neovim-python-client-0.0.36
new file mode 100644
index 000000000000..d3c347b5d1ba
--- /dev/null
+++ b/metadata/md5-cache/dev-python/neovim-python-client-0.0.36
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/click-3.0[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/msgpack-0.4.0[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-python/greenlet[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_targets_python3_3? ( dev-python/greenlet[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_targets_python3_4? ( dev-python/greenlet[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_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_3? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) 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=Python client to connect to Neovim thru its msgpack-rpc API
+EAPI=5
+HOMEPAGE=https://github.com/neovim/python-client
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/click-3.0[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/msgpack-0.4.0[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-python/greenlet[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_targets_python3_3? ( dev-python/greenlet[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_targets_python3_4? ( dev-python/greenlet[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_targets_python2_7? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_3? ( dev-python/trollius[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) 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://dev.gentoo.org/~yngwin/distfiles/neovim-python-client-0.0.36.tar.xz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=cee7f5d94a813c41c9387770d759a341
diff --git a/metadata/md5-cache/dev-python/nltk-2.0.4 b/metadata/md5-cache/dev-python/nltk-2.0.4
index 0e6afb00c8ed..ffdbaf8d3ed1 100644
--- a/metadata/md5-cache/dev-python/nltk-2.0.4
+++ b/metadata/md5-cache/dev-python/nltk-2.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=Natural Language Toolkit
 EAPI=5
 HOMEPAGE=http://nltk.org/
 IUSE=numpy tk python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=numpy? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?,xml(+)] ) >=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/n/nltk/nltk-2.0.4.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=c1664d1ad0a9c8ebd8fa685b33844d89
+_md5_=ac3bca9198865f2676628abdb7b20aca
diff --git a/metadata/md5-cache/dev-python/numba-0.17.0 b/metadata/md5-cache/dev-python/numba-0.17.0
deleted file mode 100644
index fc9b14b805e6..000000000000
--- a/metadata/md5-cache/dev-python/numba-0.17.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/llvmlite[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/numpy-1.6[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-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_3? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) test? ( python_targets_python2_7? ( dev-python/funcsigs[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(-)]
-DESCRIPTION=NumPy aware dynamic Python compiler using LLVM
-EAPI=5
-HOMEPAGE=http://numba.pydata.org/
-IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/llvmlite[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/numpy-1.6[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-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_3? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) 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=https://github.com/numba/numba/archive/0.17.0.tar.gz -> numba-0.17.0.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=6600f143797bb94905c65000958b3d6f
diff --git a/metadata/md5-cache/dev-python/numba-0.19.2 b/metadata/md5-cache/dev-python/numba-0.19.2
new file mode 100644
index 000000000000..5110fddaf9bb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/numba-0.19.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/llvmlite[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/numpy-1.6[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-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_3? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python2_7? ( dev-python/funcsigs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) 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=NumPy aware dynamic Python compiler using LLVM
+EAPI=5
+HOMEPAGE=http://numba.pydata.org/
+IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/llvmlite[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/numpy-1.6[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-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python3_3? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python2_7? ( dev-python/funcsigs[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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/numba/numba/archive/0.19.2.tar.gz -> numba-0.19.2.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=6e5d56a5dd85d39784949a4987b7c32d
diff --git a/metadata/md5-cache/dev-python/oauth2client-1.4.11 b/metadata/md5-cache/dev-python/oauth2client-1.4.11
index 3d439c9359fc..5098b051a78e 100644
--- a/metadata/md5-cache/dev-python/oauth2client-1.4.11
+++ b/metadata/md5-cache/dev-python/oauth2client-1.4.11
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/httplib2-0.9.1[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(-)] >=dev-python/pyasn1-0.1.7[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(-)] >=dev-python/pyasn1-modules-0.0.5[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(-)] >=dev-python/rsa-3.1.4[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(-)] >=dev-python/six-1.6.1[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(-)] !<=dev-python/google-api-python-client-1.1[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(-)] test? ( dev-python/nose[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(-)] ) 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(-)]
+DEPEND=>=dev-python/httplib2-0.9.1[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(-)] ~dev-python/pyasn1-0.1.7[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(-)] ~dev-python/pyasn1-modules-0.0.5[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(-)] ~dev-python/rsa-3.1.4[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(-)] >=dev-python/six-1.6.1[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(-)] !<=dev-python/google-api-python-client-1.1[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(-)] test? ( dev-python/nose[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(-)] ) 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(-)]
 DESCRIPTION=Library for accessing resources protected by OAuth 2.0
 EAPI=5
 HOMEPAGE=https://github.com/google/oauth2client
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.9.1[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(-)] >=dev-python/pyasn1-0.1.7[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(-)] >=dev-python/pyasn1-modules-0.0.5[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(-)] >=dev-python/rsa-3.1.4[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(-)] >=dev-python/six-1.6.1[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(-)] !<=dev-python/google-api-python-client-1.1[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(-)] 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(-)]
+RDEPEND=>=dev-python/httplib2-0.9.1[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(-)] ~dev-python/pyasn1-0.1.7[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(-)] ~dev-python/pyasn1-modules-0.0.5[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(-)] ~dev-python/rsa-3.1.4[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(-)] >=dev-python/six-1.6.1[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(-)] !<=dev-python/google-api-python-client-1.1[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(-)] 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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/google/oauth2client/archive/v1.4.11.tar.gz -> oauth2client-1.4.11.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=3fd278d50308258b31f828275b80f5fb
+_md5_=379406a61d61cb57b4fa4f165e96513e
diff --git a/metadata/md5-cache/dev-python/oauth2client-1.4.2 b/metadata/md5-cache/dev-python/oauth2client-1.4.2
deleted file mode 100644
index a99670d8e3e3..000000000000
--- a/metadata/md5-cache/dev-python/oauth2client-1.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/httplib2-0.8[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(-)] >=dev-python/pyasn1-0.1.7[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(-)] >=dev-python/pyasn1-modules-0.0.5[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(-)] >=dev-python/rsa-3.1.4[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(-)] >=dev-python/six-1.6.1[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(-)] !<=dev-python/google-api-python-client-1.1[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(-)] test? ( dev-python/nose[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(-)] ) 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(-)]
-DESCRIPTION=Library for accessing resources protected by OAuth 2.0
-EAPI=5
-HOMEPAGE=https://github.com/google/oauth2client
-IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.8[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(-)] >=dev-python/pyasn1-0.1.7[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(-)] >=dev-python/pyasn1-modules-0.0.5[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(-)] >=dev-python/rsa-3.1.4[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(-)] >=dev-python/six-1.6.1[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(-)] !<=dev-python/google-api-python-client-1.1[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(-)] 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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/google/oauth2client/archive/v1.4.2.tar.gz -> oauth2client-1.4.2.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=f9fce118c19a6cf8aa976c2f61a113f2
diff --git a/metadata/md5-cache/dev-python/oauth2client-1.4.6 b/metadata/md5-cache/dev-python/oauth2client-1.4.6
index b405c250bbfb..5bcd43c659f5 100644
--- a/metadata/md5-cache/dev-python/oauth2client-1.4.6
+++ b/metadata/md5-cache/dev-python/oauth2client-1.4.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/httplib2-0.8[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(-)] >=dev-python/pyasn1-0.1.7[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(-)] >=dev-python/pyasn1-modules-0.0.5[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(-)] >=dev-python/rsa-3.1.4[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(-)] >=dev-python/six-1.6.1[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(-)] !<=dev-python/google-api-python-client-1.1[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(-)] test? ( dev-python/nose[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(-)] ) 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(-)]
+DEPEND=>=dev-python/httplib2-0.8[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(-)] ~dev-python/pyasn1-0.1.7[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(-)] ~dev-python/pyasn1-modules-0.0.5[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(-)] ~dev-python/rsa-3.1.4[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(-)] >=dev-python/six-1.6.1[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(-)] !<=dev-python/google-api-python-client-1.1[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(-)] test? ( dev-python/nose[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(-)] ) 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(-)]
 DESCRIPTION=Library for accessing resources protected by OAuth 2.0
 EAPI=5
 HOMEPAGE=https://github.com/google/oauth2client
 IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
 KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/httplib2-0.8[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(-)] >=dev-python/pyasn1-0.1.7[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(-)] >=dev-python/pyasn1-modules-0.0.5[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(-)] >=dev-python/rsa-3.1.4[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(-)] >=dev-python/six-1.6.1[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(-)] !<=dev-python/google-api-python-client-1.1[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(-)] 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(-)]
+RDEPEND=>=dev-python/httplib2-0.8[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(-)] ~dev-python/pyasn1-0.1.7[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(-)] ~dev-python/pyasn1-modules-0.0.5[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(-)] ~dev-python/rsa-3.1.4[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(-)] >=dev-python/six-1.6.1[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(-)] !<=dev-python/google-api-python-client-1.1[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(-)] 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 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/google/oauth2client/archive/v1.4.6.tar.gz -> oauth2client-1.4.6.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=462bc908177b7252309ef88b0e93c2c7
+_md5_=f8fcc1e4cfa6eddd3d5db081bae88ba7
diff --git a/metadata/md5-cache/dev-python/oslo-sphinx-2.5.0 b/metadata/md5-cache/dev-python/oslo-sphinx-2.5.0
index 66f93cbd66dc..7c891e68151a 100644
--- a/metadata/md5-cache/dev-python/oslo-sphinx-2.5.0
+++ b/metadata/md5-cache/dev-python/oslo-sphinx-2.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=OpenStack Sphinx Extensions
 EAPI=5
 HOMEPAGE=http://www.openstack.org/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~hppa ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/requests-2.2.0[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/requests-2.4.0[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
 SRC_URI=mirror://pypi/o/oslosphinx/oslosphinx-2.5.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=8fd5daf3381f42bba5b6388bf12cdbf8
+_md5_=aad226ae98f3d9cd614dafc76cbc7c6e
diff --git a/metadata/md5-cache/dev-python/pandas-0.16.1-r1 b/metadata/md5-cache/dev-python/pandas-0.16.1-r1
index b88c14bf1309..c2276d3d6928 100644
--- a/metadata/md5-cache/dev-python/pandas-0.16.1-r1
+++ b/metadata/md5-cache/dev-python/pandas-0.16.1-r1
@@ -4,11 +4,11 @@ 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 python_targets_python3_3 python_targets_python3_4 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>dev-python/numpy-1.7[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/python-dateutil-2.0[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/openpyxl-1.9.0[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/numexpr-2.1[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/bottleneck[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/matplotlib[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/pytables[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/pytz[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/scipy[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(-)] excel? ( >=dev-python/openpyxl-1.6.1[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/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_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(-)] dev-python/html5lib[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(-)] ) ) R? ( dev-python/rpy[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
 SRC_URI=mirror://pypi/p/pandas/pandas-0.16.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=64d78f1028b60a7cc9c99449a75751c5
+_md5_=c9812f44760d5686ef02a34fd32e5f23
diff --git a/metadata/md5-cache/dev-python/py-1.4.30 b/metadata/md5-cache/dev-python/py-1.4.30
new file mode 100644
index 000000000000..531cd426d7ac
--- /dev/null
+++ b/metadata/md5-cache/dev-python/py-1.4.30
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[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/pytest-2.4.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(-)] ) doc? ( dev-python/sphinx[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=library with cross-python path, ini-parsing, io, code, log facilities
+EAPI=5
+HOMEPAGE=http://pylib.readthedocs.org/ http://pypi.python.org/pypi/py
+IUSE=doc test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=MIT
+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 ) 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=mirror://pypi/p/py/py-1.4.30.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=80a1e15ec873867da2a856e532a6ca70
diff --git a/metadata/md5-cache/dev-python/pycups-1.9.72 b/metadata/md5-cache/dev-python/pycups-1.9.72
index a1bc8f8abc49..1807ccd5afab 100644
--- a/metadata/md5-cache/dev-python/pycups-1.9.72
+++ b/metadata/md5-cache/dev-python/pycups-1.9.72
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the CUPS API
 EAPI=5
 HOMEPAGE=http://cyberelk.net/tim/data/pycups/
 IUSE=doc examples python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=net-print/cups 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=doc? ( || ( python_targets_python2_7 ) ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=mirror://pypi/p/pycups/pycups-1.9.72.tar.bz2
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=750c172b09ef267460bc8589e832c320
+_md5_=9a5e308460df677dbd4f7cf2b78c15ce
diff --git a/metadata/md5-cache/dev-python/pyfltk-1.3.0-r2 b/metadata/md5-cache/dev-python/pyfltk-1.3.0-r2
index 3972f7b8b08b..c9d04a512be2 100644
--- a/metadata/md5-cache/dev-python/pyfltk-1.3.0-r2
+++ b/metadata/md5-cache/dev-python/pyfltk-1.3.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Python interface to Fltk library
 EAPI=5
 HOMEPAGE=http://pyfltk.sourceforge.net/
 IUSE=doc python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2
 RDEPEND=>=x11-libs/fltk-1.3.0:1[opengl] 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://sourceforge/pyfltk/pyFltk-1.3.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=db9f162343f2f4d11ec1c2a79aff9538
+_md5_=9b4a70f8f0672628416ed2a63e0f2dbe
diff --git a/metadata/md5-cache/dev-python/pyfltk-1.3.3 b/metadata/md5-cache/dev-python/pyfltk-1.3.3
index 0531cc331c96..8191f60ac08a 100644
--- a/metadata/md5-cache/dev-python/pyfltk-1.3.3
+++ b/metadata/md5-cache/dev-python/pyfltk-1.3.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_3 python_targets_python3_4 )
 SLOT=1
 SRC_URI=mirror://sourceforge/pyfltk/pyFltk-1.3.3_py3.tar.gz -> pyFltk-1.3.3.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=698e009427299fc56a3551c25cade414
+_md5_=bd072ee88da69e187b90324b4f815f72
diff --git a/metadata/md5-cache/dev-python/pyglet-1.2.3 b/metadata/md5-cache/dev-python/pyglet-1.2.3
new file mode 100644
index 000000000000..5cb99fda4996
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyglet-1.2.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/opengl alsa? ( media-libs/alsa-lib[alisp] ) gtk? ( x11-libs/gtk+:2 ) openal? ( media-libs/openal ) 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=Cross-platform windowing and multimedia library for Python
+EAPI=5
+HOMEPAGE=http://www.pyglet.org/
+IUSE=alsa examples gtk +openal python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=virtual/opengl alsa? ( media-libs/alsa-lib[alisp] ) gtk? ( x11-libs/gtk+:2 ) openal? ( media-libs/openal ) 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=mirror://pypi/p/pyglet/pyglet-1.2.3.tar.gz http://pyglet.googlecode.com/files/pyglet-1.2.3.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=70601961167e55573a8b4ed1d5c280c2
diff --git a/metadata/md5-cache/dev-python/pygobject-3.16.2 b/metadata/md5-cache/dev-python/pygobject-3.16.2
index 0027e8a96bc2..ef62ea6438e7 100644
--- a/metadata/md5-cache/dev-python/pygobject-3.16.2
+++ b/metadata/md5-cache/dev-python/pygobject-3.16.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=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-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= virtual/libffi:= cairo? ( >=dev-python/pycairo-1.10.0[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(-)] x11-libs/cairo ) virtual/pkgconfig cairo? ( x11-libs/cairo[glib] ) test? ( dev-libs/atk[introspection] media-fonts/font-cursor-misc media-fonts/font-misc-misc x11-libs/cairo[glib] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=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-libs/glib-2.38:2 >=dev-libs/gobject-introspection-1.39:= virtual/libffi:= cairo? ( >=dev-python/pycairo-1.10.0[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(-)] x11-libs/cairo ) virtual/pkgconfig cairo? ( x11-libs/cairo[glib] ) test? ( dev-libs/atk[introspection] media-fonts/font-cursor-misc media-fonts/font-misc-misc x11-libs/cairo[glib] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] x11-libs/pango[introspection] !sparc? ( python_targets_python2_7? ( dev-python/pyflakes[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=GLib's GObject library bindings for Python
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/PyGObject
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 SLOT=3
 SRC_URI=mirror://gnome/sources/pygobject/3.16/pygobject-3.16.2.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f211d0143f3df9fe35eac4abfdd7bc7e
+_md5_=6f57aefcca6b78c21ecdbfbb52affe57
diff --git a/metadata/md5-cache/dev-python/pylibacl-0.5.0-r1 b/metadata/md5-cache/dev-python/pylibacl-0.5.0-r1
index 50b4a16a5308..af187f987a25 100644
--- a/metadata/md5-cache/dev-python/pylibacl-0.5.0-r1
+++ b/metadata/md5-cache/dev-python/pylibacl-0.5.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=POSIX ACLs (Access Control Lists) for Python
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/pylibacl/ http://pypi.python.org/pypi/pylibacl
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~alpha ~amd64 arm ~ia64 ~mips ~ppc ppc64 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm ~ia64 ~mips ~ppc ppc64 ~sh ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=sys-apps/acl 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=mirror://sourceforge/pylibacl/pylibacl-0.5.0.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=40693d6fd458868f48fb939a65ba6238
+_md5_=f2db32b0d623427f2b4b875b20f084b5
diff --git a/metadata/md5-cache/dev-python/pyspf-2.0.10 b/metadata/md5-cache/dev-python/pyspf-2.0.10
index 48bed4cd5ae4..606bb187c8ea 100644
--- a/metadata/md5-cache/dev-python/pyspf-2.0.10
+++ b/metadata/md5-cache/dev-python/pyspf-2.0.10
@@ -4,11 +4,11 @@ DESCRIPTION=Python implementation of the Sender Policy Framework (SPF) protocol
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/pyspf
 IUSE=ipv6 test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=PSF-2
 RDEPEND=dev-python/authres[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-python/ipaddr-2.1.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pydns:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python3_3? ( dev-python/pydns: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/pydns: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[ipv6?] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[ipv6?] ) python_targets_python3_4? ( dev-lang/python:3.4[ipv6?] ) >=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=test? ( ipv6 ) || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyspf/pyspf-2.0.10.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=b6f7d1b6e6a81e75daa299d2e87013c9
+_md5_=3adba993cb7843fdf08c4cbd7510fd74
diff --git a/metadata/md5-cache/dev-python/pyspf-2.0.7 b/metadata/md5-cache/dev-python/pyspf-2.0.7
deleted file mode 100644
index 4ea260b1e297..000000000000
--- a/metadata/md5-cache/dev-python/pyspf-2.0.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=test? ( dev-python/pyyaml ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=Python implementation of the Sender Policy Framework (SPF) protocol
-EAPI=3
-HOMEPAGE=http://pypi.python.org/pypi/pyspf
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=PSF-2
-RDEPEND=dev-python/authres || ( dev-python/pydns:2 dev-python/pydns:0 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyspf/pyspf-2.0.7.tar.gz
-_eclasses_=distutils	92e738ea29389cb3f34778d7a349ac71	multilib	62927b3db3a589b0806255f3a002d5d3	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=c54725d8e5252b82bd4313af26cee177
diff --git a/metadata/md5-cache/dev-python/setuptools-18.0.1 b/metadata/md5-cache/dev-python/setuptools-18.0.1
new file mode 100644
index 000000000000..74ae5bd07daf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools-18.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/pytest[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-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) python_targets_pypy? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy(-)?,-python_single_target_pypy(-)] ) ) 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=Collection of extensions to Distutils
+EAPI=5
+HOMEPAGE=http://pypi.python.org/pypi/setuptools
+IUSE=test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=PSF-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 ) 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=mirror://pypi/s/setuptools/setuptools-18.0.1.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=02869c660a17af85eed13c5bb99c87e2
diff --git a/metadata/md5-cache/dev-python/simplejson-3.7.2 b/metadata/md5-cache/dev-python/simplejson-3.7.2
index 3382402afee0..fd26babdab2a 100644
--- a/metadata/md5-cache/dev-python/simplejson-3.7.2
+++ b/metadata/md5-cache/dev-python/simplejson-3.7.2
@@ -4,11 +4,11 @@ DESCRIPTION=Simple, fast, extensible JSON encoder/decoder for Python
 EAPI=5
 HOMEPAGE=http://undefined.org/python/#simplejson http://pypi.python.org/pypi/simplejson
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy python_targets_pypy3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( MIT AFL-2.1 )
 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 ) 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=mirror://pypi/s/simplejson/simplejson-3.7.2.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=051a6cfa099bb0ad646b7a67d202ccfe
+_md5_=b50c66191109fc00a397e75d4285a7d0
diff --git a/metadata/md5-cache/dev-python/subunit-0.0.18-r2 b/metadata/md5-cache/dev-python/subunit-0.0.18-r2
index a531b7f5969d..19ff5fb585f8 100644
--- a/metadata/md5-cache/dev-python/subunit-0.0.18-r2
+++ b/metadata/md5-cache/dev-python/subunit-0.0.18-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=http://launchpad.net/subunit/trunk/0.0.18/+download/subunit-0.0.18.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2c9595636d120882bd55a5297545b5b0
diff --git a/metadata/md5-cache/dev-python/subunit-0.0.19 b/metadata/md5-cache/dev-python/subunit-0.0.19
index 15f84dde4cad..429e6014373a 100644
--- a/metadata/md5-cache/dev-python/subunit-0.0.19
+++ b/metadata/md5-cache/dev-python/subunit-0.0.19
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=http://launchpad.net/subunit/trunk/0.0.19/+download/subunit-0.0.19.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=874612aebe43045860c10ebc11e9bcb2
diff --git a/metadata/md5-cache/dev-python/subunit-0.0.21-r1 b/metadata/md5-cache/dev-python/subunit-0.0.21-r1
index d0605fba2028..610d8910a727 100644
--- a/metadata/md5-cache/dev-python/subunit-0.0.21-r1
+++ b/metadata/md5-cache/dev-python/subunit-0.0.21-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/testtools-0.9.34[python_targets_python2_7(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=http://launchpad.net/subunit/trunk/0.0.21/+download/subunit-0.0.21.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=aef585922b61fbaa0bd0d605c64567d2
diff --git a/metadata/md5-cache/dev-python/subunit-1.0.0 b/metadata/md5-cache/dev-python/subunit-1.0.0
index f0b16cc40eb5..c99bb5636b7e 100644
--- a/metadata/md5-cache/dev-python/subunit-1.0.0
+++ b/metadata/md5-cache/dev-python/subunit-1.0.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-python/testtools-0.9.34[python_targets_python2_7(-)?,python_target
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy )
 SLOT=0
 SRC_URI=http://launchpad.net/subunit/trunk/1.0.0/+download/subunit-1.0.0.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4080426f5266e4bb58466ac9a5ff13e1
diff --git a/metadata/md5-cache/dev-python/subunit-1.1.0 b/metadata/md5-cache/dev-python/subunit-1.1.0
new file mode 100644
index 000000000000..05d9d932a47a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/subunit-1.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/testtools-0.9.34[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(-)] dev-python/extras[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(-)] dev-python/setuptools[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(-)] dev-lang/perl:= >=dev-libs/check-0.9.11[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(-)?] >=dev-util/cppunit-1.13.2[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(-)?] >=virtual/pkgconfig-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(-)?] test? ( dev-python/testscenarios[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(-)] ) 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(-)]
+DESCRIPTION=A streaming protocol for test results
+EAPI=5
+HOMEPAGE=https://launchpad.net/subunit http://pypi.python.org/pypi/python-subunit
+IUSE=static-libs test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_pypy 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 ~x86 ~x86-fbsd
+LICENSE=Apache-2.0 BSD
+RDEPEND=>=dev-python/testtools-0.9.34[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(-)] dev-python/extras[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(-)] 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=http://launchpad.net/subunit/trunk/1.1.0/+download/subunit-1.1.0.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=fa1efb2b5acc2c1d4d805dcd8ac33e67
diff --git a/metadata/md5-cache/dev-qt/assistant-4.8.6-r1 b/metadata/md5-cache/dev-qt/assistant-4.8.6-r1
index 6f1bf3fadd79..e43a7f8a2a6b 100644
--- a/metadata/md5-cache/dev-qt/assistant-4.8.6-r1
+++ b/metadata/md5-cache/dev-qt/assistant-4.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qtgui-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qthelp-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qtsql-4.8.6[aqua=,debug=,sqlite,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(-)?] webkit? ( ~dev-qt/qtwebkit-4.8.6[aqua=,debug=,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(-)?] ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=17a5e62d958bee74442bca1a0cb9b0d8
diff --git a/metadata/md5-cache/dev-qt/assistant-4.8.7 b/metadata/md5-cache/dev-qt/assistant-4.8.7
index 45597d24d09c..6b5a79c01ff0 100644
--- a/metadata/md5-cache/dev-qt/assistant-4.8.7
+++ b/metadata/md5-cache/dev-qt/assistant-4.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qthelp-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qtsql-4.8.7[aqua=,debug=,sqlite,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(-)?] webkit? ( ~dev-qt/qtwebkit-4.8.7[aqua=,debug=,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(-)?] ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0a252652d41454291dac5c345bed107a
diff --git a/metadata/md5-cache/dev-qt/designer-4.8.6-r1 b/metadata/md5-cache/dev-qt/designer-4.8.6-r1
index f0dd65de5345..17e6d3bf1eb2 100644
--- a/metadata/md5-cache/dev-qt/designer-4.8.6-r1
+++ b/metadata/md5-cache/dev-qt/designer-4.8.6-r1
@@ -10,5 +10,5 @@ PDEPEND=phonon? ( kde? ( media-libs/phonon[designer,qt4] ) )
 RDEPEND=~dev-qt/qtcore-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qtgui-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qtscript-4.8.6[aqua=,debug=,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(-)?] declarative? ( ~dev-qt/qtdeclarative-4.8.6[aqua=,debug=,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(-)?] ) phonon? ( !kde? ( ~dev-qt/qtphonon-4.8.6[aqua=,debug=,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(-)?] ) ) qt3support? ( ~dev-qt/qt3support-4.8.6[aqua=,debug=,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(-)?] ) webkit? ( ~dev-qt/qtwebkit-4.8.6[aqua=,debug=,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(-)?] ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b6ac10b1698f43cba9fe79196e883192
diff --git a/metadata/md5-cache/dev-qt/designer-4.8.7 b/metadata/md5-cache/dev-qt/designer-4.8.7
index 8a574c213b6a..fc89793fd0fd 100644
--- a/metadata/md5-cache/dev-qt/designer-4.8.7
+++ b/metadata/md5-cache/dev-qt/designer-4.8.7
@@ -10,5 +10,5 @@ PDEPEND=phonon? ( kde? ( media-libs/phonon[designer,qt4] ) )
 RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qtscript-4.8.7[aqua=,debug=,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(-)?] declarative? ( ~dev-qt/qtdeclarative-4.8.7[aqua=,debug=,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(-)?] ) phonon? ( !kde? ( ~dev-qt/qtphonon-4.8.7[aqua=,debug=,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(-)?] ) ) qt3support? ( ~dev-qt/qt3support-4.8.7[aqua=,debug=,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(-)?] ) webkit? ( ~dev-qt/qtwebkit-4.8.7[aqua=,debug=,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(-)?] ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=00a52aae9e9d21a03c212f7a4d884440
diff --git a/metadata/md5-cache/dev-qt/linguist-4.8.6-r1 b/metadata/md5-cache/dev-qt/linguist-4.8.6-r1
index 1ca660574de7..5181ebe6671c 100644
--- a/metadata/md5-cache/dev-qt/linguist-4.8.6-r1
+++ b/metadata/md5-cache/dev-qt/linguist-4.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/designer-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qtcore-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qtgui-4.8.6[aqua=,debug=,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(-)?] dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=383bc60f1114991b1ce5f897a2d459f6
diff --git a/metadata/md5-cache/dev-qt/linguist-4.8.7 b/metadata/md5-cache/dev-qt/linguist-4.8.7
index a77eaeea4c14..a87963c72f94 100644
--- a/metadata/md5-cache/dev-qt/linguist-4.8.7
+++ b/metadata/md5-cache/dev-qt/linguist-4.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/designer-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qtcore-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,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(-)?] dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c3caeaae73defc704b860d573260cb87
diff --git a/metadata/md5-cache/dev-qt/pixeltool-4.8.6-r1 b/metadata/md5-cache/dev-qt/pixeltool-4.8.6-r1
index d3e82f649543..8710ccd937ff 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-4.8.6-r1
+++ b/metadata/md5-cache/dev-qt/pixeltool-4.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qtgui-4.8.6[aqua=,debug=,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(-)?] !<dev-qt/qthelp-4.8.5:4 dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=cbe0fb5420381374db4170db42776d22
diff --git a/metadata/md5-cache/dev-qt/pixeltool-4.8.7 b/metadata/md5-cache/dev-qt/pixeltool-4.8.7
index 60cfc1beba39..32ae870cdf69 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-4.8.7
+++ b/metadata/md5-cache/dev-qt/pixeltool-4.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,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(-)?] !<dev-qt/qthelp-4.8.5:4 dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e68761dcac1b8b84be67ca5e74e4da21
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-4.8.6-r1 b/metadata/md5-cache/dev-qt/qdbusviewer-4.8.6-r1
index e3bffb150017..42349d2c8940 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-4.8.6-r1
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-4.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qtdbus-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qtgui-4.8.6[aqua=,debug=,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(-)?] dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=fd6fc67d499b95c6ebbd0e468f6b9763
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-4.8.7 b/metadata/md5-cache/dev-qt/qdbusviewer-4.8.7
index fcfb9558905b..dfb1228afd7b 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-4.8.7
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-4.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qtdbus-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,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(-)?] dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=236e40c6f1a55929c2f1c0be603114bf
diff --git a/metadata/md5-cache/dev-qt/qt3support-4.8.6-r1 b/metadata/md5-cache/dev-qt/qt3support-4.8.6-r1
index 4ea5887de605..b5beda139c4b 100644
--- a/metadata/md5-cache/dev-qt/qt3support-4.8.6-r1
+++ b/metadata/md5-cache/dev-qt/qt3support-4.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.6[aqua=,debug=,qt3support,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(-)?] ~dev-qt/qtgui-4.8.6[accessibility=,aqua=,debug=,qt3support,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(-)?] ~dev-qt/qtsql-4.8.6[aqua=,debug=,qt3support,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(-)?] dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2863ebeb55496216abd2fab1efeea3ae
diff --git a/metadata/md5-cache/dev-qt/qt3support-4.8.7 b/metadata/md5-cache/dev-qt/qt3support-4.8.7
index b48bc1c04fdc..6155403511bc 100644
--- a/metadata/md5-cache/dev-qt/qt3support-4.8.7
+++ b/metadata/md5-cache/dev-qt/qt3support-4.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,qt3support,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(-)?] ~dev-qt/qtgui-4.8.7[accessibility=,aqua=,debug=,qt3support,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(-)?] ~dev-qt/qtsql-4.8.7[aqua=,debug=,qt3support,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(-)?] dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=83eb36fe96b852aabf52ea9acce19918
diff --git a/metadata/md5-cache/dev-qt/qtbearer-4.8.6-r1 b/metadata/md5-cache/dev-qt/qtbearer-4.8.6-r1
index 5a5ccbb81101..95cd48b3f92b 100644
--- a/metadata/md5-cache/dev-qt/qtbearer-4.8.6-r1
+++ b/metadata/md5-cache/dev-qt/qtbearer-4.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.6[aqua=,debug=,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(-)?] connman? ( ~dev-qt/qtdbus-4.8.6[aqua=,debug=,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(-)?] ) networkmanager? ( ~dev-qt/qtdbus-4.8.6[aqua=,debug=,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(-)?] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=3587ca063a897f7115fe41712fa74161
diff --git a/metadata/md5-cache/dev-qt/qtbearer-4.8.7 b/metadata/md5-cache/dev-qt/qtbearer-4.8.7
index c0495d9e2497..df25c1d8ad2c 100644
--- a/metadata/md5-cache/dev-qt/qtbearer-4.8.7
+++ b/metadata/md5-cache/dev-qt/qtbearer-4.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,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(-)?] connman? ( ~dev-qt/qtdbus-4.8.7[aqua=,debug=,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(-)?] ) networkmanager? ( ~dev-qt/qtdbus-4.8.7[aqua=,debug=,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(-)?] ) connman? ( net-misc/connman ) networkmanager? ( net-misc/networkmanager ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=bca1e84cdac79f0f6ef81753cf7e2bc1
diff --git a/metadata/md5-cache/dev-qt/qtcore-4.8.6-r2 b/metadata/md5-cache/dev-qt/qtcore-4.8.6-r2
index 4ea053f8a3c7..5c3e8f352f97 100644
--- a/metadata/md5-cache/dev-qt/qtcore-4.8.6-r2
+++ b/metadata/md5-cache/dev-qt/qtcore-4.8.6-r2
@@ -10,5 +10,5 @@ PDEPEND=~dev-qt/qttranslations-4.8.6 qt3support? ( ~dev-qt/qtgui-4.8.6[aqua=,deb
 RDEPEND=>=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(-)?] glib? ( dev-libs/glib:2[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(-)?] ) iconv? ( >=virtual/libiconv-0-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(-)?] ) icu? ( dev-libs/icu:=[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(-)?] ) ssl? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=9cd1a8e7fb1c2acabb029db8d8448a82
diff --git a/metadata/md5-cache/dev-qt/qtcore-4.8.7 b/metadata/md5-cache/dev-qt/qtcore-4.8.7
index d4f17b340d87..51540e0f174f 100644
--- a/metadata/md5-cache/dev-qt/qtcore-4.8.7
+++ b/metadata/md5-cache/dev-qt/qtcore-4.8.7
@@ -10,5 +10,5 @@ PDEPEND=~dev-qt/qttranslations-4.8.7 qt3support? ( ~dev-qt/qtgui-4.8.7[aqua=,deb
 RDEPEND=>=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(-)?] glib? ( dev-libs/glib:2[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(-)?] ) iconv? ( >=virtual/libiconv-0-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(-)?] ) icu? ( dev-libs/icu:=[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(-)?] ) ssl? ( >=dev-libs/openssl-1.0.1h-r2: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(-)?] ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=fca0e5c014429da009234631615ec62e
diff --git a/metadata/md5-cache/dev-qt/qtdbus-4.8.6-r1 b/metadata/md5-cache/dev-qt/qtdbus-4.8.6-r1
index 44b0e81cff91..0432c633cff6 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-4.8.6-r1
+++ b/metadata/md5-cache/dev-qt/qtdbus-4.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.6[aqua=,debug=,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(-)?] sys-apps/dbus[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(-)?] dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=941201b2223116db90e23a7a4b91bd01
diff --git a/metadata/md5-cache/dev-qt/qtdbus-4.8.7 b/metadata/md5-cache/dev-qt/qtdbus-4.8.7
index 6750653602aa..a360ad7d593d 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-4.8.7
+++ b/metadata/md5-cache/dev-qt/qtdbus-4.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,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(-)?] sys-apps/dbus[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(-)?] dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=61bed99cdeeda54424c1423cf2fe8f96
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-4.8.6-r1 b/metadata/md5-cache/dev-qt/qtdeclarative-4.8.6-r1
index 5ccb800d75ff..b99ab894c279 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-4.8.6-r1
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-4.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.6[aqua=,debug=,qt3support=,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(-)?] ~dev-qt/qtgui-4.8.6[accessibility=,aqua=,debug=,qt3support=,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(-)?] ~dev-qt/qtopengl-4.8.6[aqua=,debug=,qt3support=,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(-)?] ~dev-qt/qtscript-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qtsql-4.8.6[aqua=,debug=,qt3support=,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(-)?] ~dev-qt/qtsvg-4.8.6[accessibility=,aqua=,debug=,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(-)?] ~dev-qt/qtxmlpatterns-4.8.6[aqua=,debug=,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(-)?] qt3support? ( ~dev-qt/qt3support-4.8.6[accessibility=,aqua=,debug=,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(-)?] ) webkit? ( ~dev-qt/qtwebkit-4.8.6[aqua=,debug=,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(-)?] ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=eb7cbe82a50ac72635f46f8b930b7325
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-4.8.7 b/metadata/md5-cache/dev-qt/qtdeclarative-4.8.7
index 8d4cfa4e4aca..5e2d0bbdafca 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-4.8.7
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-4.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,qt3support=,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(-)?] ~dev-qt/qtgui-4.8.7[accessibility=,aqua=,debug=,qt3support=,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(-)?] ~dev-qt/qtopengl-4.8.7[aqua=,debug=,qt3support=,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(-)?] ~dev-qt/qtscript-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qtsql-4.8.7[aqua=,debug=,qt3support=,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(-)?] ~dev-qt/qtsvg-4.8.7[accessibility=,aqua=,debug=,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(-)?] ~dev-qt/qtxmlpatterns-4.8.7[aqua=,debug=,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(-)?] qt3support? ( ~dev-qt/qt3support-4.8.7[accessibility=,aqua=,debug=,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(-)?] ) webkit? ( ~dev-qt/qtwebkit-4.8.7[aqua=,debug=,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(-)?] ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d8e473edca8ce314ec5659e38706b815
diff --git a/metadata/md5-cache/dev-qt/qtdemo-4.8.6-r1 b/metadata/md5-cache/dev-qt/qtdemo-4.8.6-r1
index 991c408d8d4e..640e3f59a023 100644
--- a/metadata/md5-cache/dev-qt/qtdemo-4.8.6-r1
+++ b/metadata/md5-cache/dev-qt/qtdemo-4.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/designer-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qtcore-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qtgui-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qthelp-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qtscript-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qtsql-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qtsvg-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qttest-4.8.6[aqua=,debug=,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(-)?] dbus? ( ~dev-qt/qtdbus-4.8.6[aqua=,debug=,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(-)?] ) declarative? ( ~dev-qt/qtdeclarative-4.8.6[aqua=,debug=,webkit?,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(-)?] ) multimedia? ( ~dev-qt/qtmultimedia-4.8.6[aqua=,debug=,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(-)?] ) opengl? ( ~dev-qt/qtopengl-4.8.6[aqua=,debug=,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(-)?] ) openvg? ( ~dev-qt/qtopenvg-4.8.6[aqua=,debug=,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(-)?] ) phonon? ( kde? ( media-libs/phonon[aqua=,qt4] ) !kde? ( || ( ~dev-qt/qtphonon-4.8.6[aqua=,debug=,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(-)?] media-libs/phonon[aqua=,qt4] ) ) ) webkit? ( ~dev-qt/qtwebkit-4.8.6[aqua=,debug=,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(-)?] ) xmlpatterns? ( ~dev-qt/qtxmlpatterns-4.8.6[aqua=,debug=,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(-)?] ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a00ac26dab69d199923d14af5ca61312
diff --git a/metadata/md5-cache/dev-qt/qtdemo-4.8.7 b/metadata/md5-cache/dev-qt/qtdemo-4.8.7
index 0b761e8102ad..7b1d4c0c6706 100644
--- a/metadata/md5-cache/dev-qt/qtdemo-4.8.7
+++ b/metadata/md5-cache/dev-qt/qtdemo-4.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/designer-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qtcore-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qthelp-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qtscript-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qtsql-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qtsvg-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qttest-4.8.7[aqua=,debug=,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(-)?] dbus? ( ~dev-qt/qtdbus-4.8.7[aqua=,debug=,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(-)?] ) declarative? ( ~dev-qt/qtdeclarative-4.8.7[aqua=,debug=,webkit?,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(-)?] ) multimedia? ( ~dev-qt/qtmultimedia-4.8.7[aqua=,debug=,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(-)?] ) opengl? ( ~dev-qt/qtopengl-4.8.7[aqua=,debug=,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(-)?] ) openvg? ( ~dev-qt/qtopenvg-4.8.7[aqua=,debug=,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(-)?] ) phonon? ( kde? ( >=media-libs/phonon-4.8.3-r1[aqua=,qt4,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(-)?] ) !kde? ( || ( ~dev-qt/qtphonon-4.8.7[aqua=,debug=,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(-)?] >=media-libs/phonon-4.8.3-r1[aqua=,qt4,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(-)?] ) ) ) webkit? ( ~dev-qt/qtwebkit-4.8.7[aqua=,debug=,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(-)?] ) xmlpatterns? ( ~dev-qt/qtxmlpatterns-4.8.7[aqua=,debug=,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(-)?] ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4876491a371f3e17c019b34dfbb629a8
diff --git a/metadata/md5-cache/dev-qt/qtgui-4.8.6-r4 b/metadata/md5-cache/dev-qt/qtgui-4.8.6-r4
index dcfe85c889a9..e5057fffb89f 100644
--- a/metadata/md5-cache/dev-qt/qtgui-4.8.6-r4
+++ b/metadata/md5-cache/dev-qt/qtgui-4.8.6-r4
@@ -11,5 +11,5 @@ RDEPEND=app-eselect/eselect-qtgraphicssystem ~dev-qt/qtcore-4.8.6[aqua=,debug=,g
 REQUIRED_USE=gtkstyle? ( glib )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz http://dev.gentoo.org/~pesa/patches/qtgui-systemtrayicon-plugin-system.patch
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0fa6fc634c7db300123d52094b52c97a
diff --git a/metadata/md5-cache/dev-qt/qtgui-4.8.7 b/metadata/md5-cache/dev-qt/qtgui-4.8.7
index c0b2d333e659..7b5e67758f7e 100644
--- a/metadata/md5-cache/dev-qt/qtgui-4.8.7
+++ b/metadata/md5-cache/dev-qt/qtgui-4.8.7
@@ -11,5 +11,5 @@ RDEPEND=app-eselect/eselect-qtgraphicssystem ~dev-qt/qtcore-4.8.7[aqua=,debug=,g
 REQUIRED_USE=gtkstyle? ( glib )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz http://dev.gentoo.org/~pesa/patches/qtgui-systemtrayicon-plugin-system.patch
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a87b8c62675774e9b72733f4004332ef
diff --git a/metadata/md5-cache/dev-qt/qthelp-4.8.6-r3 b/metadata/md5-cache/dev-qt/qthelp-4.8.6-r3
index 300886d99e24..351d09c1b954 100644
--- a/metadata/md5-cache/dev-qt/qthelp-4.8.6-r3
+++ b/metadata/md5-cache/dev-qt/qthelp-4.8.6-r3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qtgui-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qtsql-4.8.6[aqua=,debug=,sqlite,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(-)?] compat? ( ~dev-qt/qtdbus-4.8.6[aqua=,debug=,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(-)?] >=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(-)?] ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz compat? ( http://download.qt.io/archive/qt/4.6/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a105471e54da372418f9820bee299e18
diff --git a/metadata/md5-cache/dev-qt/qthelp-4.8.7 b/metadata/md5-cache/dev-qt/qthelp-4.8.7
index 8a7ed35cdb31..e097e33ed2e5 100644
--- a/metadata/md5-cache/dev-qt/qthelp-4.8.7
+++ b/metadata/md5-cache/dev-qt/qthelp-4.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qtsql-4.8.7[aqua=,debug=,sqlite,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(-)?] compat? ( ~dev-qt/qtdbus-4.8.7[aqua=,debug=,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(-)?] >=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(-)?] ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz compat? ( http://download.qt.io/archive/qt/4.6/qt-assistant-qassistantclient-library-compat-src-4.6.3.tar.gz http://dev.gentoo.org/~pesa/distfiles/qt-assistant-compat-headers-4.7.tar.gz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=687d0d473e2b9ed7654ad6f35097d6a3
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-4.8.6-r1 b/metadata/md5-cache/dev-qt/qtmultimedia-4.8.6-r1
index 8473b634c275..f6e4ea77b4cc 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-4.8.6-r1
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-4.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qtgui-4.8.6[aqua=,debug=,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(-)?] alsa? ( media-libs/alsa-lib[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(-)?] ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2adabc8066a8ddc1ddc06da0ebc7c4f3
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-4.8.7 b/metadata/md5-cache/dev-qt/qtmultimedia-4.8.7
index f519fd4af0a6..34a261039c3e 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-4.8.7
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-4.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,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(-)?] alsa? ( media-libs/alsa-lib[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(-)?] ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=3ce8bdc6416e567d895ac595db9f74a5
diff --git a/metadata/md5-cache/dev-qt/qtopengl-4.8.6-r1 b/metadata/md5-cache/dev-qt/qtopengl-4.8.6-r1
index cbada9f698f6..32ab0b966e63 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-4.8.6-r1
+++ b/metadata/md5-cache/dev-qt/qtopengl-4.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.6[aqua=,debug=,qt3support=,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(-)?] ~dev-qt/qtgui-4.8.6[aqua=,debug=,egl=,qt3support=,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(-)?] >=x11-libs/libX11-1.5.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(-)?] >=x11-libs/libXrender-0.9.7-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(-)?] >=virtual/opengl-7.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(-)?] dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8da338b132a2aeeee8b627d670d36ea0
diff --git a/metadata/md5-cache/dev-qt/qtopengl-4.8.7 b/metadata/md5-cache/dev-qt/qtopengl-4.8.7
index 5949ffe412d2..1a0cd710e95f 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-4.8.7
+++ b/metadata/md5-cache/dev-qt/qtopengl-4.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,qt3support=,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(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,egl=,qt3support=,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(-)?] >=x11-libs/libX11-1.5.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(-)?] >=x11-libs/libXrender-0.9.7-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(-)?] >=virtual/opengl-7.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(-)?] dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6e62fcb271e29ea4cbb3df4038f4f48a
diff --git a/metadata/md5-cache/dev-qt/qtopenvg-4.8.6-r1 b/metadata/md5-cache/dev-qt/qtopenvg-4.8.6-r1
index 5b77bf973576..572e8c160503 100644
--- a/metadata/md5-cache/dev-qt/qtopenvg-4.8.6-r1
+++ b/metadata/md5-cache/dev-qt/qtopenvg-4.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.6[aqua=,debug=,qt3support=,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(-)?] ~dev-qt/qtgui-4.8.6[aqua=,debug=,egl,qt3support=,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(-)?] media-libs/mesa[egl,openvg,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(-)?] dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0d679e53de5826b86041ba9f0d131363
diff --git a/metadata/md5-cache/dev-qt/qtopenvg-4.8.7 b/metadata/md5-cache/dev-qt/qtopenvg-4.8.7
index 9df21bde5695..fe2191134070 100644
--- a/metadata/md5-cache/dev-qt/qtopenvg-4.8.7
+++ b/metadata/md5-cache/dev-qt/qtopenvg-4.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,qt3support=,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(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,egl,qt3support=,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(-)?] media-libs/mesa[egl,openvg,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(-)?] dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=cc8475167527e26872a1bc6bd9f8e9cb
diff --git a/metadata/md5-cache/dev-qt/qtphonon-4.8.6-r1 b/metadata/md5-cache/dev-qt/qtphonon-4.8.6-r1
index fda9cec452c1..4e02f86d44ab 100644
--- a/metadata/md5-cache/dev-qt/qtphonon-4.8.6-r1
+++ b/metadata/md5-cache/dev-qt/qtphonon-4.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qtgui-4.8.6[aqua=,debug=,qt3support=,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(-)?] aqua? ( ~dev-qt/qtopengl-4.8.6[aqua=,debug=,qt3support=,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(-)?] ) !aqua? ( >=media-libs/gstreamer-0.10.36-r1:0.10[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(-)?] >=media-plugins/gst-plugins-meta-0.10-r9:0.10[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(-)?] ) dbus? ( ~dev-qt/qtdbus-4.8.6[aqua=,debug=,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(-)?] ) !kde-apps/phonon-kde !media-libs/phonon dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d72e14135ff9b9a2f087764d14f1dd83
diff --git a/metadata/md5-cache/dev-qt/qtphonon-4.8.7 b/metadata/md5-cache/dev-qt/qtphonon-4.8.7
index 5b1cfdf2029d..da2485ccb69e 100644
--- a/metadata/md5-cache/dev-qt/qtphonon-4.8.7
+++ b/metadata/md5-cache/dev-qt/qtphonon-4.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,qt3support=,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(-)?] aqua? ( ~dev-qt/qtopengl-4.8.7[aqua=,debug=,qt3support=,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(-)?] ) !aqua? ( >=media-libs/gstreamer-0.10.36-r1:0.10[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(-)?] >=media-plugins/gst-plugins-meta-0.10-r9:0.10[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(-)?] ) dbus? ( ~dev-qt/qtdbus-4.8.7[aqua=,debug=,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(-)?] ) !kde-apps/phonon-kde !media-libs/phonon !media-libs/phonon-gstreamer dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7d6c6e0ce45d6306fa600e80a09dd35a
diff --git a/metadata/md5-cache/dev-qt/qtscript-4.8.6-r2 b/metadata/md5-cache/dev-qt/qtscript-4.8.6-r2
index fa68a054add4..2826e2e03121 100644
--- a/metadata/md5-cache/dev-qt/qtscript-4.8.6-r2
+++ b/metadata/md5-cache/dev-qt/qtscript-4.8.6-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.6[aqua=,debug=,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(-)?] dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0796910e0c899981017774918b9ea87f
diff --git a/metadata/md5-cache/dev-qt/qtscript-4.8.7 b/metadata/md5-cache/dev-qt/qtscript-4.8.7
index 4cdf50dffbf2..872f1401dfca 100644
--- a/metadata/md5-cache/dev-qt/qtscript-4.8.7
+++ b/metadata/md5-cache/dev-qt/qtscript-4.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,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(-)?] dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=5ff75a68de084695a5917110eaf891bb
diff --git a/metadata/md5-cache/dev-qt/qtsql-4.8.6-r1 b/metadata/md5-cache/dev-qt/qtsql-4.8.6-r1
index 822f2789dc35..79e0435c86a0 100644
--- a/metadata/md5-cache/dev-qt/qtsql-4.8.6-r1
+++ b/metadata/md5-cache/dev-qt/qtsql-4.8.6-r1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-4.8.6[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(
 REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=09daeb1a61023f2a1756f5a045148c0f
diff --git a/metadata/md5-cache/dev-qt/qtsql-4.8.7 b/metadata/md5-cache/dev-qt/qtsql-4.8.7
index 0fe2aa95e00f..d382597b341f 100644
--- a/metadata/md5-cache/dev-qt/qtsql-4.8.7
+++ b/metadata/md5-cache/dev-qt/qtsql-4.8.7
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,qt3support=,abi_x86_32(-)?,abi_x86_64(
 REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=9e8dd10285351faa03dd58ff17f1b588
diff --git a/metadata/md5-cache/dev-qt/qtsvg-4.8.6-r1 b/metadata/md5-cache/dev-qt/qtsvg-4.8.6-r1
index a553c93ebf46..b360cb385092 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-4.8.6-r1
+++ b/metadata/md5-cache/dev-qt/qtsvg-4.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qtgui-4.8.6[accessibility=,aqua=,debug=,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(-)?] >=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(-)?] dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=15b9a80edac48ef5139e574a97dfd69b
diff --git a/metadata/md5-cache/dev-qt/qtsvg-4.8.7 b/metadata/md5-cache/dev-qt/qtsvg-4.8.7
index 3cf41144ccc4..dd6d4df1967d 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-4.8.7
+++ b/metadata/md5-cache/dev-qt/qtsvg-4.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qtgui-4.8.7[accessibility=,aqua=,debug=,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(-)?] >=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(-)?] dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=be000ad80ff19e6095e6236ee308d628
diff --git a/metadata/md5-cache/dev-qt/qttest-4.8.6-r1 b/metadata/md5-cache/dev-qt/qttest-4.8.6-r1
index 95b29694333c..632a8aa3d85b 100644
--- a/metadata/md5-cache/dev-qt/qttest-4.8.6-r1
+++ b/metadata/md5-cache/dev-qt/qttest-4.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.6[aqua=,debug=,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(-)?] dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=099a8f5974703d0a350282adc92ae509
diff --git a/metadata/md5-cache/dev-qt/qttest-4.8.7 b/metadata/md5-cache/dev-qt/qttest-4.8.7
index d7a56fbe3aca..a46ef9f58b60 100644
--- a/metadata/md5-cache/dev-qt/qttest-4.8.7
+++ b/metadata/md5-cache/dev-qt/qttest-4.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,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(-)?] dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=573cea9fa468326828bd8ed3e08751ea
diff --git a/metadata/md5-cache/dev-qt/qttranslations-4.8.6-r1 b/metadata/md5-cache/dev-qt/qttranslations-4.8.6-r1
index b1efd3e2d677..a067cc918936 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-4.8.6-r1
+++ b/metadata/md5-cache/dev-qt/qttranslations-4.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b961cb42910a0e669deca042aa0490b7
diff --git a/metadata/md5-cache/dev-qt/qttranslations-4.8.7 b/metadata/md5-cache/dev-qt/qttranslations-4.8.7
index 2e65331b8071..a699cbad0ad3 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-4.8.7
+++ b/metadata/md5-cache/dev-qt/qttranslations-4.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7bff77990a6b2b837d5c3cf5f8442d76
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-4.8.6-r1 b/metadata/md5-cache/dev-qt/qtwebkit-4.8.6-r1
index d7e2126b6138..e20e861719b1 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-4.8.6-r1
+++ b/metadata/md5-cache/dev-qt/qtwebkit-4.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=>=dev-db/sqlite-3.8.3:3[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(-)?] ~dev-qt/qtcore-4.8.6[aqua=,debug=,ssl,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(-)?] ~dev-qt/qtgui-4.8.6[aqua=,debug=,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(-)?] ~dev-qt/qtxmlpatterns-4.8.6[aqua=,debug=,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(-)?] >=x11-libs/libX11-1.5.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(-)?] >=x11-libs/libXrender-0.9.7-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(-)?] gstreamer? ( dev-libs/glib:2[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(-)?] dev-libs/libxml2:2[!icu?,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(-)?] >=media-libs/gstreamer-0.10.36-r1:0.10[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(-)?] >=media-libs/gst-plugins-base-0.10.36-r1:0.10[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(-)?] ) icu? ( dev-libs/icu:=[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(-)?] ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=43957fd3a5df02849cd53e22f35066d3
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-4.8.7 b/metadata/md5-cache/dev-qt/qtwebkit-4.8.7
index 7576436a3fb4..e68566475795 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-4.8.7
+++ b/metadata/md5-cache/dev-qt/qtwebkit-4.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=>=dev-db/sqlite-3.8.3:3[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(-)?] ~dev-qt/qtcore-4.8.7[aqua=,debug=,ssl,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(-)?] ~dev-qt/qtgui-4.8.7[aqua=,debug=,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(-)?] ~dev-qt/qtxmlpatterns-4.8.7[aqua=,debug=,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(-)?] >=x11-libs/libX11-1.5.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(-)?] >=x11-libs/libXrender-0.9.7-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(-)?] gstreamer? ( dev-libs/glib:2[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(-)?] dev-libs/libxml2:2[!icu?,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(-)?] >=media-libs/gstreamer-0.10.36-r1:0.10[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(-)?] >=media-libs/gst-plugins-base-0.10.36-r1:0.10[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(-)?] ) icu? ( dev-libs/icu:=[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(-)?] ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=cf72e0cc229d1080bea6431a94958d11
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.6-r1 b/metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.6-r1
index a07e017aa89f..3d7da32681a0 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.6-r1
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.6-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.6[aqua=,debug=,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(-)?] dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4b6aa5d1554b43d145abcfedfe02b69f
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.7 b/metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.7
index fea6e3132cb8..ebe970ae1ffe 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.7
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-4.8.7
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-4.8.7[aqua=,debug=,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(-)?] dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qt4-build-multilib	3e40e5e364af254b30746e5e6586b49e	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=bbc040334023e874479d199857c76794
diff --git a/metadata/md5-cache/dev-ruby/bundler-audit-0.3.1 b/metadata/md5-cache/dev-ruby/bundler-audit-0.3.1
new file mode 100644
index 000000000000..509f3fda6fa3
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bundler-audit-0.3.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( dev-ruby/thor[ruby_targets_ruby19] dev-ruby/bundler[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/thor[ruby_targets_ruby20] dev-ruby/bundler[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/thor[ruby_targets_ruby21] dev-ruby/bundler[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? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) 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_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 easy way to vendor gem dependencies
+EAPI=5
+HOMEPAGE=https://github.com/rubysec/bundler-audit
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=ruby_targets_ruby19? ( dev-ruby/thor[ruby_targets_ruby19] dev-ruby/bundler[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/thor[ruby_targets_ruby20] dev-ruby/bundler[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/thor[ruby_targets_ruby21] dev-ruby/bundler[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? ( 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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://rubygems/bundler-audit-0.3.1.gem
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=fe5f8aaff60821c14738473c14b214dc
diff --git a/metadata/md5-cache/dev-ruby/daemons-1.2.3 b/metadata/md5-cache/dev-ruby/daemons-1.2.3
new file mode 100644
index 000000000000..cfc6d2ba9c9d
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/daemons-1.2.3
@@ -0,0 +1,14 @@
+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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[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=Wrap existing ruby scripts to be run as a daemon
+EAPI=5
+HOMEPAGE=https://github.com/thuehlinger/daemons
+IUSE=examples elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+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 )
+SLOT=0
+SRC_URI=mirror://rubygems/daemons-1.2.3.gem
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=f26fe392a4ecda95a3f9e018012d4ed9
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.2.0 b/metadata/md5-cache/dev-ruby/exifr-1.2.0
deleted file mode 100644
index 7f59c09080f3..000000000000
--- a/metadata/md5-cache/dev-ruby/exifr-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=A library to read EXIF info from JPEG and TIFF images
-EAPI=5
-HOMEPAGE=http://exifr.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~x86
-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 )
-SLOT=0
-SRC_URI=mirror://rubygems/exifr-1.2.0.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9587ab888a97080b16ae73aa6d51f614
diff --git a/metadata/md5-cache/dev-ruby/exifr-1.2.1 b/metadata/md5-cache/dev-ruby/exifr-1.2.1
deleted file mode 100644
index 764479be1515..000000000000
--- a/metadata/md5-cache/dev-ruby/exifr-1.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-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? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=A library to read EXIF info from JPEG and TIFF images
-EAPI=5
-HOMEPAGE=http://exifr.rubyforge.org/
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
-KEYWORDS=~amd64 ~x86
-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 )
-SLOT=0
-SRC_URI=mirror://rubygems/exifr-1.2.1.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ec3b4be27ec672a84c8ea7adfe5fc0bb
diff --git a/metadata/md5-cache/dev-ruby/ffi-1.9.9 b/metadata/md5-cache/dev-ruby/ffi-1.9.9
new file mode 100644
index 000000000000..93c1c7aba849
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ffi-1.9.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=virtual/libffi ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) 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? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) ) 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_ruby22? ( test? ( dev-ruby/rspec:3[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=Ruby extension for programmatically loading dynamic libraries
+EAPI=5
+HOMEPAGE=https://wiki.github.com/ffi/ffi
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=BSD
+RDEPEND=virtual/libffi 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 )
+SLOT=0
+SRC_URI=https://github.com/ffi/ffi/archive/1.9.9.tar.gz -> ffi-git-1.9.9.tgz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=b2225e9c9eb43e95f02531c1d9bf44bb
diff --git a/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3 b/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3
index 3f51533b1fae..89767f4505b6 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3
+++ b/metadata/md5-cache/dev-ruby/gherkin-2.12.0-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-util/ragel ruby_targets_ruby19? ( dev-ruby/rake-compiler[ruby_targets_ruby19] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=dev-util/cucumber-1.1.3[ruby_targets_ruby19] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby19] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby19] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( dev-ruby/rake-compiler[ruby_targets_ruby20] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby20] >=dev-util/cucumber-1.1.3[ruby_targets_ruby20] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby20] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby20] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/rake-compiler[ruby_targets_ruby21] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby21] >=dev-util/cucumber-1.1.3[ruby_targets_ruby21] >=dev-ruby/rspec-2.6.0[ruby_targets_ruby21] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby21] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.3[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? ( 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] ) )
+DEPEND=dev-util/ragel ruby_targets_ruby19? ( dev-ruby/rake-compiler[ruby_targets_ruby19] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby19] >=dev-util/cucumber-1.1.3[ruby_targets_ruby19] >=dev-ruby/rspec-2.6.0:2[ruby_targets_ruby19] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby19] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( dev-ruby/rake-compiler[ruby_targets_ruby20] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby20] >=dev-util/cucumber-1.1.3[ruby_targets_ruby20] >=dev-ruby/rspec-2.6.0:2[ruby_targets_ruby20] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby20] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( dev-ruby/rake-compiler[ruby_targets_ruby21] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby21] >=dev-util/cucumber-1.1.3[ruby_targets_ruby21] >=dev-ruby/rspec-2.6.0:2[ruby_targets_ruby21] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby21] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( dev-ruby/rake-compiler[ruby_targets_ruby22] test? ( >=dev-ruby/builder-2.1.2[ruby_targets_ruby22] >=dev-util/cucumber-1.1.3[ruby_targets_ruby22] >=dev-ruby/rspec-2.6.0:2[ruby_targets_ruby22] >=dev-ruby/term-ansicolor-1.0.5[ruby_targets_ruby22] ) doc? ( >=dev-ruby/yard-0.8.3[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] ) ) 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] ) 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=Fast Gherkin lexer and parser based on Ragel
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/gherkin
-IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc test
+IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.3[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? ( 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 )
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] ) 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 )
 SLOT=0
 SRC_URI=https://github.com/cucumber/gherkin/archive/v2.12.0.tar.gz -> gherkin-2.12.0-git.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f8a5d22bc3642c3455afd6a2d8389d80
+_md5_=6d7d5a78d5466ee0469edf0ff50a4f28
diff --git a/metadata/md5-cache/dev-ruby/gherkin-2.12.2 b/metadata/md5-cache/dev-ruby/gherkin-2.12.2
index 8a15301288ef..711f23ffe914 100644
--- a/metadata/md5-cache/dev-ruby/gherkin-2.12.2
+++ b/metadata/md5-cache/dev-ruby/gherkin-2.12.2
@@ -4,11 +4,11 @@ DESCRIPTION=Fast Gherkin lexer and parser based on Ragel
 EAPI=5
 HOMEPAGE=https://github.com/cucumber/gherkin
 IUSE=doc test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/multi_json-1.3[ruby_targets_ruby22] ) 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 )
 SLOT=0
 SRC_URI=https://github.com/cucumber/gherkin/archive/v2.12.2.tar.gz -> gherkin-2.12.2-git.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=af11202561ff94293be58c9a4925dda6
+_md5_=67e4dd8480c920138d46f16999d18d14
diff --git a/metadata/md5-cache/dev-ruby/mustache-1.0.2 b/metadata/md5-cache/dev-ruby/mustache-1.0.2
new file mode 100644
index 000000000000..db51cd127edd
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/mustache-1.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby20? ( doc? ( app-text/ronn[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( app-text/ronn[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( app-text/ronn[ruby_targets_ruby22] ) ) 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_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) )
+DESCRIPTION=Mustache is a framework-agnostic way to render logic-free views
+EAPI=5
+HOMEPAGE=http://mustache.github.com/
+IUSE=elibc_FreeBSD ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=MIT
+RDEPEND=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_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_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=mirror://rubygems/mustache-1.0.2.gem
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=b31c21d4b338c5c52705d613dad88189
diff --git a/metadata/md5-cache/dev-ruby/rack-1.4.6 b/metadata/md5-cache/dev-ruby/rack-1.4.6
index 88df6ed09228..d0468834a80e 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.4.6
+++ b/metadata/md5-cache/dev-ruby/rack-1.4.6
@@ -4,11 +4,11 @@ DESCRIPTION=A modular Ruby webserver interface
 EAPI=5
 HOMEPAGE=http://rack.github.com/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) !<dev-ruby/rack-1.1.3-r1:0 !<dev-ruby/rack-1.2.5:1.2 !<dev-ruby/rack-1.3.6-r1:1.3 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=1.4
 SRC_URI=mirror://rubygems/rack-1.4.6.gem
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=93f4222cc497cb4ea208d836aa864bce
+_md5_=e84df79068a33c9e475b8071de35d163
diff --git a/metadata/md5-cache/dev-ruby/rack-1.5.4 b/metadata/md5-cache/dev-ruby/rack-1.5.4
index 74ee469a45d3..a7ab61b744ef 100644
--- a/metadata/md5-cache/dev-ruby/rack-1.5.4
+++ b/metadata/md5-cache/dev-ruby/rack-1.5.4
@@ -4,11 +4,11 @@ DESCRIPTION=A modular Ruby webserver interface
 EAPI=5
 HOMEPAGE=http://rack.github.com/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( virtual/ruby-ssl[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/ruby-ssl[ruby_targets_ruby20] ) !<dev-ruby/rack-1.4.5-r1:1.4 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=1.5
 SRC_URI=mirror://rubygems/rack-1.5.4.gem
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=4598915c2789e0353d37016082837636
+_md5_=5f0d8782f5832c275e0021dc3afe3a63
diff --git a/metadata/md5-cache/dev-ruby/railties-4.1.10 b/metadata/md5-cache/dev-ruby/railties-4.1.10
index 5439be7f68c7..76f06dc329ca 100644
--- a/metadata/md5-cache/dev-ruby/railties-4.1.10
+++ b/metadata/md5-cache/dev-ruby/railties-4.1.10
@@ -6,10 +6,10 @@ HOMEPAGE=http://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64
 LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.19 ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.1.10[ruby_targets_ruby19] ~dev-ruby/actionpack-4.1.10[ruby_targets_ruby19] >=dev-ruby/thor-0.18.1[ruby_targets_ruby19] >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.1.10[ruby_targets_ruby20] ~dev-ruby/actionpack-4.1.10[ruby_targets_ruby20] >=dev-ruby/thor-0.18.1[ruby_targets_ruby20] >=dev-ruby/rake-0.8.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.1.10[ruby_targets_ruby21] ~dev-ruby/actionpack-4.1.10[ruby_targets_ruby21] >=dev-ruby/thor-0.18.1[ruby_targets_ruby21] >=dev-ruby/rake-0.8.7[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? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+RDEPEND=>=app-eselect/eselect-rails-0.20 ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.1.10[ruby_targets_ruby19] ~dev-ruby/actionpack-4.1.10[ruby_targets_ruby19] >=dev-ruby/thor-0.18.1[ruby_targets_ruby19] >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.1.10[ruby_targets_ruby20] ~dev-ruby/actionpack-4.1.10[ruby_targets_ruby20] >=dev-ruby/thor-0.18.1[ruby_targets_ruby20] >=dev-ruby/rake-0.8.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.1.10[ruby_targets_ruby21] ~dev-ruby/actionpack-4.1.10[ruby_targets_ruby21] >=dev-ruby/thor-0.18.1[ruby_targets_ruby21] >=dev-ruby/rake-0.8.7[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? ( 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 )
 RESTRICT=test
 SLOT=4.1
 SRC_URI=http://github.com/rails/rails/archive/v4.1.10.tar.gz -> rails-4.1.10.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=03c4d90eeeb513680edd267442bef395
+_md5_=b4005c2b9ccb85ec66779f8d23b08885
diff --git a/metadata/md5-cache/dev-ruby/railties-4.1.11 b/metadata/md5-cache/dev-ruby/railties-4.1.11
index 2b39028927ac..def99709a488 100644
--- a/metadata/md5-cache/dev-ruby/railties-4.1.11
+++ b/metadata/md5-cache/dev-ruby/railties-4.1.11
@@ -6,10 +6,10 @@ HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64
 LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.19 ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.1.11[ruby_targets_ruby19] ~dev-ruby/actionpack-4.1.11[ruby_targets_ruby19] >=dev-ruby/thor-0.18.1[ruby_targets_ruby19] >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.1.11[ruby_targets_ruby20] ~dev-ruby/actionpack-4.1.11[ruby_targets_ruby20] >=dev-ruby/thor-0.18.1[ruby_targets_ruby20] >=dev-ruby/rake-0.8.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.1.11[ruby_targets_ruby21] ~dev-ruby/actionpack-4.1.11[ruby_targets_ruby21] >=dev-ruby/thor-0.18.1[ruby_targets_ruby21] >=dev-ruby/rake-0.8.7[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? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+RDEPEND=>=app-eselect/eselect-rails-0.20 ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.1.11[ruby_targets_ruby19] ~dev-ruby/actionpack-4.1.11[ruby_targets_ruby19] >=dev-ruby/thor-0.18.1[ruby_targets_ruby19] >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.1.11[ruby_targets_ruby20] ~dev-ruby/actionpack-4.1.11[ruby_targets_ruby20] >=dev-ruby/thor-0.18.1[ruby_targets_ruby20] >=dev-ruby/rake-0.8.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.1.11[ruby_targets_ruby21] ~dev-ruby/actionpack-4.1.11[ruby_targets_ruby21] >=dev-ruby/thor-0.18.1[ruby_targets_ruby21] >=dev-ruby/rake-0.8.7[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? ( 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 )
 RESTRICT=test
 SLOT=4.1
 SRC_URI=https://github.com/rails/rails/archive/v4.1.11.tar.gz -> rails-4.1.11.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=de5135dec95508116906f9f2911e410d
+_md5_=88f7b6a8eabe278212eddaf376d5e7fa
diff --git a/metadata/md5-cache/dev-ruby/railties-4.1.12 b/metadata/md5-cache/dev-ruby/railties-4.1.12
index 37032b3bfbee..f3826e4a385c 100644
--- a/metadata/md5-cache/dev-ruby/railties-4.1.12
+++ b/metadata/md5-cache/dev-ruby/railties-4.1.12
@@ -6,10 +6,10 @@ HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64
 LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.19 ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.1.12[ruby_targets_ruby19] ~dev-ruby/actionpack-4.1.12[ruby_targets_ruby19] >=dev-ruby/thor-0.18.1[ruby_targets_ruby19] >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.1.12[ruby_targets_ruby20] ~dev-ruby/actionpack-4.1.12[ruby_targets_ruby20] >=dev-ruby/thor-0.18.1[ruby_targets_ruby20] >=dev-ruby/rake-0.8.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.1.12[ruby_targets_ruby21] ~dev-ruby/actionpack-4.1.12[ruby_targets_ruby21] >=dev-ruby/thor-0.18.1[ruby_targets_ruby21] >=dev-ruby/rake-0.8.7[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? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+RDEPEND=>=app-eselect/eselect-rails-0.20 ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.1.12[ruby_targets_ruby19] ~dev-ruby/actionpack-4.1.12[ruby_targets_ruby19] >=dev-ruby/thor-0.18.1[ruby_targets_ruby19] >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.1.12[ruby_targets_ruby20] ~dev-ruby/actionpack-4.1.12[ruby_targets_ruby20] >=dev-ruby/thor-0.18.1[ruby_targets_ruby20] >=dev-ruby/rake-0.8.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.1.12[ruby_targets_ruby21] ~dev-ruby/actionpack-4.1.12[ruby_targets_ruby21] >=dev-ruby/thor-0.18.1[ruby_targets_ruby21] >=dev-ruby/rake-0.8.7[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? ( 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 )
 RESTRICT=test
 SLOT=4.1
 SRC_URI=https://github.com/rails/rails/archive/v4.1.12.tar.gz -> rails-4.1.12.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=941b9a8cbc32c6c9e35f78f3b142342c
+_md5_=6078a2bc79c77fc61d3702ae0864e52b
diff --git a/metadata/md5-cache/dev-ruby/railties-4.2.1 b/metadata/md5-cache/dev-ruby/railties-4.2.1
index 5f56ec6532a3..8c2a03063575 100644
--- a/metadata/md5-cache/dev-ruby/railties-4.2.1
+++ b/metadata/md5-cache/dev-ruby/railties-4.2.1
@@ -6,10 +6,10 @@ HOMEPAGE=http://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64
 LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.19 ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.2.1[ruby_targets_ruby19] ~dev-ruby/actionpack-4.2.1[ruby_targets_ruby19] >=dev-ruby/thor-0.18.1[ruby_targets_ruby19] >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.2.1[ruby_targets_ruby20] ~dev-ruby/actionpack-4.2.1[ruby_targets_ruby20] >=dev-ruby/thor-0.18.1[ruby_targets_ruby20] >=dev-ruby/rake-0.8.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.1[ruby_targets_ruby21] ~dev-ruby/actionpack-4.2.1[ruby_targets_ruby21] >=dev-ruby/thor-0.18.1[ruby_targets_ruby21] >=dev-ruby/rake-0.8.7[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? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+RDEPEND=>=app-eselect/eselect-rails-0.21 ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.2.1[ruby_targets_ruby19] ~dev-ruby/actionpack-4.2.1[ruby_targets_ruby19] >=dev-ruby/thor-0.18.1[ruby_targets_ruby19] >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.2.1[ruby_targets_ruby20] ~dev-ruby/actionpack-4.2.1[ruby_targets_ruby20] >=dev-ruby/thor-0.18.1[ruby_targets_ruby20] >=dev-ruby/rake-0.8.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.1[ruby_targets_ruby21] ~dev-ruby/actionpack-4.2.1[ruby_targets_ruby21] >=dev-ruby/thor-0.18.1[ruby_targets_ruby21] >=dev-ruby/rake-0.8.7[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? ( 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 )
 RESTRICT=test
 SLOT=4.2
 SRC_URI=http://github.com/rails/rails/archive/v4.2.1.tar.gz -> rails-4.2.1.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=51ff1a54650ff993f5bc1b4d8ffca02a
+_md5_=5272620e2d11ae103b4b615d067cfb0d
diff --git a/metadata/md5-cache/dev-ruby/railties-4.2.2 b/metadata/md5-cache/dev-ruby/railties-4.2.2
index c62101efc33b..905ca6895dc6 100644
--- a/metadata/md5-cache/dev-ruby/railties-4.2.2
+++ b/metadata/md5-cache/dev-ruby/railties-4.2.2
@@ -6,10 +6,10 @@ HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64
 LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.19 ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.2.2[ruby_targets_ruby19] ~dev-ruby/actionpack-4.2.2[ruby_targets_ruby19] >=dev-ruby/thor-0.18.1[ruby_targets_ruby19] >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.2.2[ruby_targets_ruby20] ~dev-ruby/actionpack-4.2.2[ruby_targets_ruby20] >=dev-ruby/thor-0.18.1[ruby_targets_ruby20] >=dev-ruby/rake-0.8.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.2[ruby_targets_ruby21] ~dev-ruby/actionpack-4.2.2[ruby_targets_ruby21] >=dev-ruby/thor-0.18.1[ruby_targets_ruby21] >=dev-ruby/rake-0.8.7[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? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+RDEPEND=>=app-eselect/eselect-rails-0.21 ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.2.2[ruby_targets_ruby19] ~dev-ruby/actionpack-4.2.2[ruby_targets_ruby19] >=dev-ruby/thor-0.18.1[ruby_targets_ruby19] >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.2.2[ruby_targets_ruby20] ~dev-ruby/actionpack-4.2.2[ruby_targets_ruby20] >=dev-ruby/thor-0.18.1[ruby_targets_ruby20] >=dev-ruby/rake-0.8.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.2[ruby_targets_ruby21] ~dev-ruby/actionpack-4.2.2[ruby_targets_ruby21] >=dev-ruby/thor-0.18.1[ruby_targets_ruby21] >=dev-ruby/rake-0.8.7[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? ( 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 )
 RESTRICT=test
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.2.tar.gz -> rails-4.2.2.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9f5f1bec72811445a3f90a143eeaf140
+_md5_=33e1ee7211f9f4c591a33243782786f9
diff --git a/metadata/md5-cache/dev-ruby/railties-4.2.3 b/metadata/md5-cache/dev-ruby/railties-4.2.3
index 2c930920633c..79c14d6cb22c 100644
--- a/metadata/md5-cache/dev-ruby/railties-4.2.3
+++ b/metadata/md5-cache/dev-ruby/railties-4.2.3
@@ -6,10 +6,10 @@ HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
 KEYWORDS=~amd64 ~arm ~ppc ~ppc64
 LICENSE=MIT
-RDEPEND=>=app-eselect/eselect-rails-0.19 ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.2.3[ruby_targets_ruby19] ~dev-ruby/actionpack-4.2.3[ruby_targets_ruby19] >=dev-ruby/thor-0.18.1[ruby_targets_ruby19] >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.2.3[ruby_targets_ruby20] ~dev-ruby/actionpack-4.2.3[ruby_targets_ruby20] >=dev-ruby/thor-0.18.1[ruby_targets_ruby20] >=dev-ruby/rake-0.8.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.3[ruby_targets_ruby21] ~dev-ruby/actionpack-4.2.3[ruby_targets_ruby21] >=dev-ruby/thor-0.18.1[ruby_targets_ruby21] >=dev-ruby/rake-0.8.7[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? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] )
+RDEPEND=>=app-eselect/eselect-rails-0.21 ruby_targets_ruby19? ( ~dev-ruby/activesupport-4.2.3[ruby_targets_ruby19] ~dev-ruby/actionpack-4.2.3[ruby_targets_ruby19] >=dev-ruby/thor-0.18.1[ruby_targets_ruby19] >=dev-ruby/rake-0.8.7[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/activesupport-4.2.3[ruby_targets_ruby20] ~dev-ruby/actionpack-4.2.3[ruby_targets_ruby20] >=dev-ruby/thor-0.18.1[ruby_targets_ruby20] >=dev-ruby/rake-0.8.7[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/activesupport-4.2.3[ruby_targets_ruby21] ~dev-ruby/actionpack-4.2.3[ruby_targets_ruby21] >=dev-ruby/thor-0.18.1[ruby_targets_ruby21] >=dev-ruby/rake-0.8.7[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? ( 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 )
 RESTRICT=test
 SLOT=4.2
 SRC_URI=https://github.com/rails/rails/archive/v4.2.3.tar.gz -> rails-4.2.3.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=773ffb66f1dca55cc09e16e8850ebe3d
+_md5_=f94b5b7dc63daff14beec32a44f84fa1
diff --git a/metadata/md5-cache/dev-ruby/rake-remote_task-2.3.0 b/metadata/md5-cache/dev-ruby/rake-remote_task-2.3.0
new file mode 100644
index 000000000000..012331fc0c67
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rake-remote_task-2.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( >=dev-ruby/hoe-2.9.2[ruby_targets_ruby19] test? ( dev-ruby/minitest[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( >=dev-ruby/hoe-2.9.2[ruby_targets_ruby20] test? ( dev-ruby/minitest[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( >=dev-ruby/hoe-2.9.2[ruby_targets_ruby21] test? ( dev-ruby/minitest[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/hoe-2.9.2[ruby_targets_ruby22] test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/open4-1.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/open4-1.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/open4-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/open4-1.0[ruby_targets_ruby22] ) ) 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? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=Vlad the Deployer's sexy brainchild is rake-remote_task, extending Rake with remote task goodness
+EAPI=5
+HOMEPAGE=http://rubyhitsquad.com/
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/open4-1.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/open4-1.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/open4-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/open4-1.0[ruby_targets_ruby22] ) 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 )
+SLOT=0
+SRC_URI=mirror://rubygems/rake-remote_task-2.3.0.gem
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=bf5d8b59325b0e36bff2c54fccaff442
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.18.5 b/metadata/md5-cache/dev-ruby/rbpdf-1.18.5
deleted file mode 100644
index a817df43976d..000000000000
--- a/metadata/md5-cache/dev-ruby/rbpdf-1.18.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( dev-ruby/rails:3.2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rails:3.2[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
-DESCRIPTION=Ruby on Rails TCPDF plugin
-EAPI=5
-HOMEPAGE=https://github.com/naitoh/rbpdf
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-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/rbpdf-1.18.5.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6646bd3996f9c50102ccef29b0263396
diff --git a/metadata/md5-cache/dev-ruby/rbpdf-1.18.6 b/metadata/md5-cache/dev-ruby/rbpdf-1.18.6
new file mode 100644
index 000000000000..85b39df6cf3f
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rbpdf-1.18.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( test? ( || ( ( dev-ruby/actionpack:3.2[ruby_targets_ruby19] dev-ruby/minitest:0[ruby_targets_ruby19] ) ( dev-ruby/actionpack:4.0[ruby_targets_ruby19] dev-ruby/minitest:0[ruby_targets_ruby19] ) ( dev-ruby/actionview:*[ruby_targets_ruby19] dev-ruby/minitest:5[ruby_targets_ruby19] ) ) ) ) ruby_targets_ruby20? ( test? ( || ( ( dev-ruby/actionpack:3.2[ruby_targets_ruby20] dev-ruby/minitest:0[ruby_targets_ruby20] ) ( dev-ruby/actionpack:4.0[ruby_targets_ruby20] dev-ruby/minitest:0[ruby_targets_ruby20] ) ( dev-ruby/actionview:*[ruby_targets_ruby20] dev-ruby/minitest:5[ruby_targets_ruby20] ) ) ) ) test? ( ruby_targets_ruby19? ( || ( dev-ruby/actionpack:3.2[ruby_targets_ruby19] dev-ruby/actionpack:4.0[ruby_targets_ruby19] dev-ruby/actionview:*[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( || ( dev-ruby/actionpack:3.2[ruby_targets_ruby20] dev-ruby/actionpack:4.0[ruby_targets_ruby20] dev-ruby/actionview:*[ruby_targets_ruby20] ) ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) )
+DESCRIPTION=Ruby on Rails TCPDF plugin
+EAPI=5
+HOMEPAGE=https://github.com/naitoh/rbpdf
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=ruby_targets_ruby19? ( || ( dev-ruby/actionpack:3.2[ruby_targets_ruby19] dev-ruby/actionpack:4.0[ruby_targets_ruby19] dev-ruby/actionview:*[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( || ( dev-ruby/actionpack:3.2[ruby_targets_ruby20] dev-ruby/actionpack:4.0[ruby_targets_ruby20] dev-ruby/actionview:*[ruby_targets_ruby20] ) ) 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/rbpdf-1.18.6.gem
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=1b61a1d7d06bcc0521843afbd1e45619
diff --git a/metadata/md5-cache/dev-ruby/rspec-3.3.0 b/metadata/md5-cache/dev-ruby/rspec-3.3.0
new file mode 100644
index 000000000000..04e848114deb
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-3.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( =dev-ruby/rspec-core-3.3*[ruby_targets_ruby19] =dev-ruby/rspec-expectations-3.3*[ruby_targets_ruby19] =dev-ruby/rspec-mocks-3.3*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( =dev-ruby/rspec-core-3.3*[ruby_targets_ruby20] =dev-ruby/rspec-expectations-3.3*[ruby_targets_ruby20] =dev-ruby/rspec-mocks-3.3*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( =dev-ruby/rspec-core-3.3*[ruby_targets_ruby21] =dev-ruby/rspec-expectations-3.3*[ruby_targets_ruby21] =dev-ruby/rspec-mocks-3.3*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-core-3.3*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-3.3*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-3.3*[ruby_targets_ruby22] ) ) 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] ) 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=A Behaviour Driven Development (BDD) framework for Ruby
+EAPI=5
+HOMEPAGE=https://github.com/rspec/rspec
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-core-3.3*[ruby_targets_ruby19] =dev-ruby/rspec-expectations-3.3*[ruby_targets_ruby19] =dev-ruby/rspec-mocks-3.3*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( =dev-ruby/rspec-core-3.3*[ruby_targets_ruby20] =dev-ruby/rspec-expectations-3.3*[ruby_targets_ruby20] =dev-ruby/rspec-mocks-3.3*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( =dev-ruby/rspec-core-3.3*[ruby_targets_ruby21] =dev-ruby/rspec-expectations-3.3*[ruby_targets_ruby21] =dev-ruby/rspec-mocks-3.3*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-core-3.3*[ruby_targets_ruby22] =dev-ruby/rspec-expectations-3.3*[ruby_targets_ruby22] =dev-ruby/rspec-mocks-3.3*[ruby_targets_ruby22] ) 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 )
+SLOT=3
+SRC_URI=mirror://rubygems/rspec-3.3.0.gem
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=0ab2dce450e7c5bcbaf024b4b9cca3e9
diff --git a/metadata/md5-cache/dev-ruby/rspec-core-3.3.1 b/metadata/md5-cache/dev-ruby/rspec-core-3.3.1
new file mode 100644
index 000000000000..b761d48a6dc0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-core-3.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby19] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby19] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby20] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby20] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby19] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby19] dev-ruby/syntax[ruby_targets_ruby19] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby19] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby19] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby20] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby20] dev-ruby/syntax[ruby_targets_ruby20] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby20] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby20] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby21] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] dev-ruby/syntax[ruby_targets_ruby21] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby21] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/nokogiri-1.5.2[ruby_targets_ruby22] >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] dev-ruby/syntax[ruby_targets_ruby22] >=dev-ruby/zentest-4.6.2[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-mocks-2.99.0:3[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=A Behaviour Driven Development (BDD) framework for Ruby
+EAPI=5
+HOMEPAGE=https://github.com/rspec/rspec-core
+IUSE=highlight test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby19] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby19] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby20] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby20] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby21] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] !!<dev-ruby/rspec-core-2.14.8-r4[ruby_targets_ruby22] highlight? ( >=dev-ruby/coderay-1.0.9[ruby_targets_ruby22] ) ) 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 )
+SLOT=3
+SRC_URI=https://github.com/rspec/rspec-core/archive/v3.3.1.tar.gz -> rspec-core-3.3.1-git.tgz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=e6623664a45cd95bcc810b4da65e87a6
diff --git a/metadata/md5-cache/dev-ruby/rspec-expectations-3.3.0 b/metadata/md5-cache/dev-ruby/rspec-expectations-3.3.0
new file mode 100644
index 000000000000..f55b29f41f36
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-expectations-3.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby19] <dev-ruby/diff-lcs-2[ruby_targets_ruby19] =dev-ruby/rspec-support-3.3*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby20] <dev-ruby/diff-lcs-2[ruby_targets_ruby20] =dev-ruby/rspec-support-3.3*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby21] <dev-ruby/diff-lcs-2[ruby_targets_ruby21] =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] <dev-ruby/diff-lcs-2[ruby_targets_ruby22] =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-mocks-3.2.0:3[ruby_targets_ruby22] ) ) 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/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_ruby22? ( test? ( dev-ruby/rspec:3[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=A Behaviour Driven Development (BDD) framework for Ruby
+EAPI=5
+HOMEPAGE=https://github.com/rspec/rspec-expectations
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby19] <dev-ruby/diff-lcs-2[ruby_targets_ruby19] =dev-ruby/rspec-support-3.3*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby20] <dev-ruby/diff-lcs-2[ruby_targets_ruby20] =dev-ruby/rspec-support-3.3*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby21] <dev-ruby/diff-lcs-2[ruby_targets_ruby21] =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/diff-lcs-1.2.0[ruby_targets_ruby22] <dev-ruby/diff-lcs-2[ruby_targets_ruby22] =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] ) 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 )
+SLOT=3
+SRC_URI=https://github.com/rspec/rspec-expectations/archive/v3.3.0.tar.gz -> rspec-expectations-3.3.0-git.tgz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=0fee74ab8383cfd415d6af2f129a7d6c
diff --git a/metadata/md5-cache/dev-ruby/rspec-mocks-3.3.1 b/metadata/md5-cache/dev-ruby/rspec-mocks-3.3.1
new file mode 100644
index 000000000000..f0fe750377c0
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-mocks-3.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby19] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby20] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby21] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-core-3.3.0:3[ruby_targets_ruby22] >=dev-ruby/rspec-expectations-2.99.0:3[ruby_targets_ruby22] ) ) 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/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_ruby22? ( test? ( dev-ruby/rspec:3[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=A Behaviour Driven Development (BDD) framework for Ruby
+EAPI=5
+HOMEPAGE=https://github.com/rspec/rspec-mocks
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby21] ) ruby_targets_ruby22? ( =dev-ruby/rspec-support-3.3*[ruby_targets_ruby22] ) 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 )
+SLOT=3
+SRC_URI=https://github.com/rspec/rspec-mocks/archive/v3.3.1.tar.gz -> rspec-mocks-3.3.1-git.tgz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=3ae3ecd81f33496e816f715933bf0538
diff --git a/metadata/md5-cache/dev-ruby/rspec-rails-3.3.2 b/metadata/md5-cache/dev-ruby/rspec-rails-3.3.2
new file mode 100644
index 000000000000..10ca76740b11
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-rails-3.3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby19] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby19] >=dev-ruby/railties-3.0:*[ruby_targets_ruby19] =dev-ruby/rspec-3.3*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby20] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby20] >=dev-ruby/railties-3.0:*[ruby_targets_ruby20] =dev-ruby/rspec-3.3*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/rspec-3.3*[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby19] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby19] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby19] ~dev-ruby/rspec-rails-3.3.2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby20] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby20] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby20] ~dev-ruby/rspec-rails-3.3.2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( =dev-ruby/mocha-0.10*[ruby_targets_ruby21] >=dev-ruby/capybara-2.0.0[ruby_targets_ruby21] >=dev-ruby/ammeter-1.1.2[ruby_targets_ruby21] ~dev-ruby/rspec-rails-3.3.2[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=RSpec's official Ruby on Rails plugin
+EAPI=5
+HOMEPAGE=http://rspec.info/
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby19] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby19] >=dev-ruby/railties-3.0:*[ruby_targets_ruby19] =dev-ruby/rspec-3.3*[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby20] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby20] >=dev-ruby/railties-3.0:*[ruby_targets_ruby20] =dev-ruby/rspec-3.3*[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/activesupport-3.0:*[ruby_targets_ruby21] >=dev-ruby/actionpack-3.0:*[ruby_targets_ruby21] >=dev-ruby/railties-3.0:*[ruby_targets_ruby21] =dev-ruby/rspec-3.3*[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? ( 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=3
+SRC_URI=https://github.com/rspec/rspec-rails/archive/v3.3.2.tar.gz -> rspec-rails-3.3.2.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=d57949ab43656345ff000707ccc92574
diff --git a/metadata/md5-cache/dev-ruby/rspec-support-3.3.0 b/metadata/md5-cache/dev-ruby/rspec-support-3.3.0
new file mode 100644
index 000000000000..bc6b5c7621e4
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rspec-support-3.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/rspec-3.3.0:3[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/rspec-3.3.0:3[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/rspec-3.3.0:3[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-3.3.0:3[ruby_targets_ruby22] ) ) 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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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_ruby22? ( test? ( dev-ruby/rspec:3[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=A Behaviour Driven Development (BDD) framework for Ruby
+EAPI=5
+HOMEPAGE=https://github.com/rspec/rspec-support
+IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+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 )
+SLOT=3
+SRC_URI=https://github.com/rspec/rspec-support/archive/v3.3.0.tar.gz -> rspec-support-3.3.0-git.tgz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=90dd4c414af2a31d8862cdf655d5e7d0
diff --git a/metadata/md5-cache/dev-ruby/ruby-beautify-0.92.2 b/metadata/md5-cache/dev-ruby/ruby-beautify-0.92.2
deleted file mode 100644
index fb8bff04caf3..000000000000
--- a/metadata/md5-cache/dev-ruby/ruby-beautify-0.92.2
+++ /dev/null
@@ -1,14 +0,0 @@
-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_ruby19? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby20] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby21] >=dev-ruby/rspec-core-2.14.8-r2[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=a cli tool (and module) to beautify ruby code
-EAPI=5
-HOMEPAGE=https://github.com/erniebrodeur/ruby-beautify
-IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 doc 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-beautify-0.92.2.gem
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=ec8bc2e6e9f36d0f5b8ab808d6c744dd
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.1.4 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.1.4
index 415db23aac55..8c3244db692e 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.1.4
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.1.4
@@ -4,11 +4,11 @@ DESCRIPTION=Generates readable ruby from ParseTree
 EAPI=5
 HOMEPAGE=http://seattlerb.rubyforge.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby19? ( dev-ruby/sexp_processor:4[ruby_targets_ruby19] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby19] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/sexp_processor:4[ruby_targets_ruby20] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby20] !<dev-ruby/ruby2ruby-1.3.1-r1[ruby_targets_ruby20] ) 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=2
 SRC_URI=mirror://rubygems/ruby2ruby-2.1.4.gem
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c7510eb0052c884bf2d58a36178fdcdf
+_md5_=2b1097b79a1f9e54996a3d22c81ce6e2
diff --git a/metadata/md5-cache/dev-ruby/ruby_parser-3.6.6 b/metadata/md5-cache/dev-ruby/ruby_parser-3.6.6
index 253b4e95e19d..aa0e8450704a 100644
--- a/metadata/md5-cache/dev-ruby/ruby_parser-3.6.6
+++ b/metadata/md5-cache/dev-ruby/ruby_parser-3.6.6
@@ -4,11 +4,11 @@ DESCRIPTION=A ruby parser written in pure ruby
 EAPI=5
 HOMEPAGE=https://github.com/seattlerb/ruby_parser
 IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/sexp_processor-4.1:4[ruby_targets_ruby19] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/sexp_processor-4.1:4[ruby_targets_ruby20] !<dev-ruby/ruby_parser-2.3.1-r1[ruby_targets_ruby20] ) 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=3
 SRC_URI=mirror://rubygems/ruby_parser-3.6.6.gem
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2dc55cf09f4b0eb1c95a74d74dd95fa0
+_md5_=49fe99666d2da6c9eae65db77c99fde4
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.2.5 b/metadata/md5-cache/dev-ruby/rubygems-2.2.5
index 86716fa42a74..5b50d62827b0 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.2.5
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.2.5
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby19] dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby20] dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby21] dev-ruby/rdoc[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 )
+DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby19] dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby20] dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
 DESCRIPTION=Centralized Ruby extension management system
 EAPI=5
 HOMEPAGE=http://rubyforge.org/projects/rubygems/
-IUSE=server test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21
+IUSE=server test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Ruby MIT )
 PDEPEND=server? ( >=dev-ruby/builder-2.1 )
-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 )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
+RDEPEND=ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://production.cf.rubygems.org/rubygems/rubygems-2.2.5.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=248a50ed09629adce14661b1f12e6878
+_md5_=9a1d3b961813a82b843e5df68c764d14
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.2.4 b/metadata/md5-cache/dev-ruby/rubygems-2.2.5-r1
similarity index 97%
rename from metadata/md5-cache/dev-ruby/rubygems-2.2.4
rename to metadata/md5-cache/dev-ruby/rubygems-2.2.5-r1
index 37b85db35481..810e33a9244f 100644
--- a/metadata/md5-cache/dev-ruby/rubygems-2.2.4
+++ b/metadata/md5-cache/dev-ruby/rubygems-2.2.5-r1
@@ -10,6 +10,6 @@ PDEPEND=server? ( >=dev-ruby/builder-2.1 )
 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 )
 REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 )
 SLOT=0
-SRC_URI=http://production.cf.rubygems.org/rubygems/rubygems-2.2.4.tgz
+SRC_URI=http://production.cf.rubygems.org/rubygems/rubygems-2.2.5.tgz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=39b5bfdb1018e3111ce0cf1a4baaabd9
+_md5_=471b939ecc6906728a936e476f320eb4
diff --git a/metadata/md5-cache/dev-ruby/rubygems-2.4.7 b/metadata/md5-cache/dev-ruby/rubygems-2.4.7
deleted file mode 100644
index 897a29c4d9b6..000000000000
--- a/metadata/md5-cache/dev-ruby/rubygems-2.4.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby19] dev-ruby/rdoc[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby20] dev-ruby/rdoc[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby21] dev-ruby/rdoc[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/minitest-4:0[ruby_targets_ruby22] dev-ruby/rdoc[ruby_targets_ruby22] ) ) 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 )
-DESCRIPTION=Centralized Ruby extension management system
-EAPI=5
-HOMEPAGE=http://rubyforge.org/projects/rubygems/
-IUSE=server test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Ruby MIT )
-PDEPEND=server? ( >=dev-ruby/builder-2.1 )
-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 )
-REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
-SLOT=0
-SRC_URI=http://production.cf.rubygems.org/rubygems/rubygems-2.4.7.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e9c4211d45ae207d0b8e5b6ee224bab7
diff --git a/metadata/md5-cache/dev-ruby/sexp_processor-4.4.4 b/metadata/md5-cache/dev-ruby/sexp_processor-4.4.4
index f44209e1f2a0..dabd134f8fa5 100644
--- a/metadata/md5-cache/dev-ruby/sexp_processor-4.4.4
+++ b/metadata/md5-cache/dev-ruby/sexp_processor-4.4.4
@@ -4,11 +4,11 @@ DESCRIPTION=Processor for s-expressions created as part of the ParseTree project
 EAPI=5
 HOMEPAGE=http://www.zenspider.com/ZSS/Products/ParseTree/
 IUSE=elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 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=4
 SRC_URI=mirror://rubygems/sexp_processor-4.4.4.gem
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7c75a5f88d929528beb42405c1bc90e0
+_md5_=f5a4297928859e2afd1d048da35d5e97
diff --git a/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.1 b/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.2
similarity index 96%
rename from metadata/md5-cache/dev-ruby/term-ansicolor-1.3.1
rename to metadata/md5-cache/dev-ruby/term-ansicolor-1.3.2
index c6050242376a..6ce456dbb4fc 100644
--- a/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.1
+++ b/metadata/md5-cache/dev-ruby/term-ansicolor-1.3.2
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=ruby_targets_ruby20? ( >=dev-ruby/tins-1.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/tins-1.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/tins-1.0[ruby_targets_ruby22] ) 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_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_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
 SLOT=0
-SRC_URI=mirror://rubygems/term-ansicolor-1.3.1.gem
+SRC_URI=mirror://rubygems/term-ansicolor-1.3.2.gem
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=21d16671ae69a62550938f15612506e3
+_md5_=57116e0492d899ae7ca0ef2a362c083a
diff --git a/metadata/md5-cache/dev-ruby/test-unit-3.1.2 b/metadata/md5-cache/dev-ruby/test-unit-3.1.2
index a3edc13fabaa..5fdbf0f4f623 100644
--- a/metadata/md5-cache/dev-ruby/test-unit-3.1.2
+++ b/metadata/md5-cache/dev-ruby/test-unit-3.1.2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/yard[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/yard[ruby_targets_ruby21] ) ) test? ( ruby_targets_ruby20? ( dev-ruby/power_assert[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/power_assert[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/power_assert[ruby_targets_ruby22] ) ) 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] ) )
+DEPEND=test? ( ruby_targets_ruby20? ( dev-ruby/power_assert[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/power_assert[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/power_assert[ruby_targets_ruby22] ) ) 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=An xUnit family unit testing framework for Ruby
 EAPI=5
 HOMEPAGE=https://rubygems.org/gems/test-unit
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ru
 SLOT=2
 SRC_URI=mirror://rubygems/test-unit-3.1.2.gem
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c506e1ef8f7460993e3214c7a258b690
+_md5_=c8b07a857b48204c287320db4cbfe302
diff --git a/metadata/md5-cache/dev-ruby/vlad-2.6.5 b/metadata/md5-cache/dev-ruby/vlad-2.6.5
new file mode 100644
index 000000000000..b91802f90be1
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/vlad-2.6.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby19? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby19] test? ( >=dev-ruby/minitest-5.7[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby20] test? ( >=dev-ruby/minitest-5.7[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby21] test? ( >=dev-ruby/minitest-5.7[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( >=dev-ruby/hoe-3.13[ruby_targets_ruby22] test? ( >=dev-ruby/minitest-5.7[ruby_targets_ruby22] ) ) test? ( ruby_targets_ruby19? ( >=dev-ruby/rake-remote_task-2.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rake-remote_task-2.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rake-remote_task-2.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rake-remote_task-2.3[ruby_targets_ruby22] ) ) 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? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_ruby20? ( doc? ( dev-ruby/rake[ruby_targets_ruby20] ) ) ruby_targets_ruby21? ( doc? ( dev-ruby/rake[ruby_targets_ruby21] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/rake[ruby_targets_ruby22] ) ) 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=Pragmatic application deployment automation, without mercy
+EAPI=5
+HOMEPAGE=http://rubyhitsquad.com/Vlad_the_Deployer.html
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 doc test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby19? ( >=dev-ruby/rake-remote_task-2.3[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rake-remote_task-2.3[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rake-remote_task-2.3[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rake-remote_task-2.3[ruby_targets_ruby22] ) 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 )
+SLOT=0
+SRC_URI=mirror://rubygems/vlad-2.6.5.gem
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	d4f8591e9b20b106327e9d143eb13da5	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=07f18cf2ba92489e70960b85ea8e5081
diff --git a/metadata/md5-cache/dev-scheme/elk-3.99.7 b/metadata/md5-cache/dev-scheme/elk-3.99.7
deleted file mode 100644
index c1b5fe032c21..000000000000
--- a/metadata/md5-cache/dev-scheme/elk-3.99.7
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=compile install test
-DESCRIPTION=Scheme implementation designed to be embeddable extension to C/C++ applications
-HOMEPAGE=http://sam.zoy.org/elk
-KEYWORDS=~amd64
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://sam.zoy.org/elk/elk-3.99.7.tar.bz2
-_md5_=d52951ec9e6772ae4e3f8a8a6963514d
diff --git a/metadata/md5-cache/dev-scheme/guile-lib-0.1.3 b/metadata/md5-cache/dev-scheme/guile-lib-0.1.3
deleted file mode 100644
index 2ce0ca5d7dfb..000000000000
--- a/metadata/md5-cache/dev-scheme/guile-lib-0.1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-scheme/guile[regex,deprecated] !<dev-libs/g-wrap-1.9.8
-DESCRIPTION=An accumulation place for pure-scheme Guile modules
-EAPI=3
-HOMEPAGE=http://www.nongnu.org/guile-lib/
-KEYWORDS=~alpha amd64 hppa ~ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-scheme/guile[regex,deprecated]
-SLOT=0
-SRC_URI=http://download.gna.org/guile-lib/guile-lib-0.1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=4d7862de25d7b92fa13274ad1fcf36f0
diff --git a/metadata/md5-cache/dev-scheme/guile-lib-0.1.6 b/metadata/md5-cache/dev-scheme/guile-lib-0.1.6
deleted file mode 100644
index 2dbec05ef3e2..000000000000
--- a/metadata/md5-cache/dev-scheme/guile-lib-0.1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-scheme/guile[regex,deprecated] !<dev-libs/g-wrap-1.9.8
-DESCRIPTION=An accumulation place for pure-scheme Guile modules
-EAPI=3
-HOMEPAGE=http://www.nongnu.org/guile-lib/
-KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-scheme/guile[regex,deprecated]
-SLOT=0
-SRC_URI=http://download.gna.org/guile-lib/guile-lib-0.1.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=444cd45978fe910cd967c5ee30044c7c
diff --git a/metadata/md5-cache/dev-scheme/kawa-1.9.1 b/metadata/md5-cache/dev-scheme/kawa-1.9.1
deleted file mode 100644
index a3a71111e9c5..000000000000
--- a/metadata/md5-cache/dev-scheme/kawa-1.9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install preinst setup
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0
-DESCRIPTION=Kawa, the Java-based Scheme system
-HOMEPAGE=http://www.gnu.org/software/kawa/
-IUSE=elibc_FreeBSD
-KEYWORDS=x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.4 >=dev-java/java-config-2.2.0
-SLOT=0
-SRC_URI=mirror://gnu/kawa/kawa-1.9.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2c0029bab0d6c3bcbd1a81bc66d48f42
diff --git a/metadata/md5-cache/dev-scheme/kawa-1.9.90-r1 b/metadata/md5-cache/dev-scheme/kawa-1.9.90-r1
deleted file mode 100644
index d2f8a05b1d81..000000000000
--- a/metadata/md5-cache/dev-scheme/kawa-1.9.90-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=( >=virtual/jdk-1.5 ) frontend? ( sys-libs/readline:0 ) sax? ( dev-java/sax:0 ) echo2? ( dev-java/echo2 ) swt? ( dev-java/swt:3.5 ) servlets? ( dev-java/servletapi:2.4 ) xqtests? ( app-arch/unzip:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-DESCRIPTION=Kawa, the Java-based Scheme system & Language Framework
-EAPI=3
-HOMEPAGE=http://www.gnu.org/software/kawa/
-IUSE=+awt echo2 +frontend jemacs krl +sax servlets +swing swt +xml xqtests elibc_FreeBSD source
-KEYWORDS=~x86
-LICENSE=MIT public-domain jemacs? ( GPL-2 ) krl? ( GPL-2 )
-RDEPEND=( >=virtual/jdk-1.5 ) frontend? ( sys-libs/readline:0 ) sax? ( dev-java/sax:0 ) echo2? ( dev-java/echo2 ) swt? ( dev-java/swt:3.5 ) servlets? ( dev-java/servletapi:2.4 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://gnu/kawa/kawa-1.9.90.tar.gz xqtests? ( http://www.w3.org/XML/Query/test-suite/XQTS_1_0_2.zip )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=93db3669b400d66f0badfef77bba5882
diff --git a/metadata/md5-cache/dev-scheme/scmxlate-20060613 b/metadata/md5-cache/dev-scheme/scmxlate-20060613
deleted file mode 100644
index c24fdad8ba86..000000000000
--- a/metadata/md5-cache/dev-scheme/scmxlate-20060613
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Scmxlate is a configuration tool for software packages written in Scheme
-HOMEPAGE=http://www.ccs.neu.edu/home/dorai/scmxlate/scmxlate.html
-KEYWORDS=~amd64 ~x86
-LICENSE=freedist
-SLOT=0
-SRC_URI=mirror://gentoo/scmxlate-20060613.tar.gz
-_md5_=a7ac5e62557f3a98f8e60c3ec01ad8c6
diff --git a/metadata/md5-cache/dev-scheme/sigscheme-0.8.3 b/metadata/md5-cache/dev-scheme/sigscheme-0.8.3
deleted file mode 100644
index f06ccf9f9b6b..000000000000
--- a/metadata/md5-cache/dev-scheme/sigscheme-0.8.3
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=SigScheme is an R5RS Scheme interpreter for embedded use
-EAPI=3
-HOMEPAGE=http://code.google.com/p/sigscheme/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://sigscheme.googlecode.com/files/sigscheme-0.8.3.tar.bz2
-_md5_=5f9a7e6c190b55a7f4c5843373ae8955
diff --git a/metadata/md5-cache/dev-scheme/stklos-1.01 b/metadata/md5-cache/dev-scheme/stklos-1.01
deleted file mode 100644
index a10684699fea..000000000000
--- a/metadata/md5-cache/dev-scheme/stklos-1.01
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/gmp dev-libs/libpcre virtual/libffi dev-libs/boehm-gc[threads?]
-DESCRIPTION=fast and light Scheme implementation
-EAPI=3
-HOMEPAGE=http://www.stklos.net
-IUSE=threads
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/gmp dev-libs/libpcre virtual/libffi dev-libs/boehm-gc[threads?]
-SLOT=0
-SRC_URI=http://www.stklos.net/download/stklos-1.01.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=63cc8070fff949c3cefe3ed50ea62d3a
diff --git a/metadata/md5-cache/dev-scheme/tinyscheme-1.38-r1 b/metadata/md5-cache/dev-scheme/tinyscheme-1.38-r1
deleted file mode 100644
index 966c29cf160d..000000000000
--- a/metadata/md5-cache/dev-scheme/tinyscheme-1.38-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Lightweight scheme interpreter
-HOMEPAGE=http://tinyscheme.sourceforge.net
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://tinyscheme.sourceforge.net/tinyscheme1.38.zip
-_md5_=8fae2bb3345492d43e830cc628151f84
diff --git a/metadata/md5-cache/dev-scheme/tinyscheme-1.39-r1 b/metadata/md5-cache/dev-scheme/tinyscheme-1.39-r1
deleted file mode 100644
index 22ad895dd0ff..000000000000
--- a/metadata/md5-cache/dev-scheme/tinyscheme-1.39-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip
-DESCRIPTION=Lightweight scheme interpreter
-EAPI=3
-HOMEPAGE=http://tinyscheme.sourceforge.net
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=mirror://sourceforge/tinyscheme/tinyscheme1.39.zip
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=93d9097b7ffd8182ff730a2079cb0c85
diff --git a/metadata/md5-cache/dev-scheme/tinyscheme-1.40 b/metadata/md5-cache/dev-scheme/tinyscheme-1.40
deleted file mode 100644
index 6353b33bfe26..000000000000
--- a/metadata/md5-cache/dev-scheme/tinyscheme-1.40
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Lightweight scheme interpreter
-EAPI=3
-HOMEPAGE=http://tinyscheme.sourceforge.net
-KEYWORDS=~amd64 ~ppc ~x86 ~ppc-macos ~x64-macos
-LICENSE=BSD
-SLOT=0
-SRC_URI=mirror://sourceforge/tinyscheme/tinyscheme-1.40.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=05796c1dd8ddab44baab5a5407196050
diff --git a/metadata/md5-cache/dev-tcltk/tkpiechart-6.5 b/metadata/md5-cache/dev-tcltk/tkpiechart-6.5
deleted file mode 100644
index 8c06d7dfc6e5..000000000000
--- a/metadata/md5-cache/dev-tcltk/tkpiechart-6.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=>=dev-lang/tk-8.3 dev-tcltk/tcllib
-DESCRIPTION=create and update 2D or 3D pie charts in a Tcl/Tk application
-HOMEPAGE=http://jfontain.free.fr/piechart6.htm
-KEYWORDS=x86 ~ppc ~amd64
-LICENSE=jfontain
-RDEPEND=>=dev-lang/tk-8.3 dev-tcltk/tcllib
-SLOT=0
-SRC_URI=http://jfontain.free.fr/tkpiechart-6.5.tar.bz2
-_md5_=90c9e2d3d19f66727fcce5372748e952
diff --git a/metadata/md5-cache/dev-tcltk/tktable-2.9 b/metadata/md5-cache/dev-tcltk/tktable-2.9
deleted file mode 100644
index e4957881d09b..000000000000
--- a/metadata/md5-cache/dev-tcltk/tktable-2.9
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/tk-8.0
-DESCRIPTION=full-featured 2D table widget
-HOMEPAGE=http://tktable.sourceforge.net/
-KEYWORDS=~amd64 ppc x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/tk-8.0
-SLOT=0
-SRC_URI=mirror://sourceforge/tktable/Tktable2.9.tar.gz
-_md5_=919625499772be7d2f928a84fae794e8
diff --git a/metadata/md5-cache/dev-tcltk/tkzinc-3.3.4 b/metadata/md5-cache/dev-tcltk/tkzinc-3.3.4
deleted file mode 100644
index 1bf47ffc81ea..000000000000
--- a/metadata/md5-cache/dev-tcltk/tkzinc-3.3.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/tk media-libs/glew virtual/opengl doc? ( virtual/latex-base ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A Tk widget library
-EAPI=3
-HOMEPAGE=http://www.tkzinc.org
-IUSE=debug doc threads
-KEYWORDS=~amd64 ~x86 ~ppc
-LICENSE=LGPL-2
-RDEPEND=dev-lang/tk media-libs/glew virtual/opengl doc? ( virtual/latex-base )
-SLOT=0
-SRC_URI=http://www.tkzinc.org/Packages/zinc-tk_3.3.4.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=2e22a79a413e85e8c0c01b80e6eb6fa2
diff --git a/metadata/md5-cache/dev-tcltk/vtcl-1.6.0 b/metadata/md5-cache/dev-tcltk/vtcl-1.6.0
deleted file mode 100644
index 268b616ab3c5..000000000000
--- a/metadata/md5-cache/dev-tcltk/vtcl-1.6.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/tk
-DESCRIPTION=Visual Tcl is a high-quality application development environment
-HOMEPAGE=http://vtcl.sf.net
-IUSE=doc
-KEYWORDS=~amd64 ppc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/tk
-SLOT=0
-SRC_URI=mirror://sourceforge/vtcl/vtcl-1.6.0.tar.gz
-_md5_=593e14ff27d88a3afa3713cdc843dcd0
diff --git a/metadata/md5-cache/dev-util/apitrace-4.0 b/metadata/md5-cache/dev-util/apitrace-4.0
index 4dab277d2c10..9f5fb78b5185 100644
--- a/metadata/md5-cache/dev-util/apitrace-4.0
+++ b/metadata/md5-cache/dev-util/apitrace-4.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=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(+)] >=app-arch/snappy-1.1.1[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(-)?] >=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(-)?] >=media-libs/mesa-9.1.6[egl?,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(-)?] egl? ( || ( >=media-libs/mesa-8.0[gles1,gles2] <media-libs/mesa-8.0[gles] ) ) media-libs/libpng:0= sys-process/procps x11-libs/libX11 qt4? ( >=dev-qt/qtcore-4.7:4 >=dev-qt/qtgui-4.7:4 >=dev-qt/qtwebkit-4.7:4 >=dev-libs/qjson-0.5 )
 SLOT=0
 SRC_URI=https://github.com/apitrace/apitrace/tarball/4.0 -> apitrace-4.0.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
 _md5_=d0aba9a776a0fc0d6999ba2bb4baf53f
diff --git a/metadata/md5-cache/dev-util/apitrace-5.0 b/metadata/md5-cache/dev-util/apitrace-5.0
index c8e9d750961a..fb03aa6bf499 100644
--- a/metadata/md5-cache/dev-util/apitrace-5.0
+++ b/metadata/md5-cache/dev-util/apitrace-5.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=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(+)] >=app-arch/snappy-1.1.1[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(-)?] >=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(-)?] >=media-libs/mesa-9.1.6[egl?,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(-)?] egl? ( || ( >=media-libs/mesa-8.0[gles1,gles2] <media-libs/mesa-8.0[gles] ) ) media-libs/libpng:0= sys-process/procps x11-libs/libX11 qt4? ( >=dev-qt/qtcore-4.7:4 >=dev-qt/qtgui-4.7:4 >=dev-qt/qtwebkit-4.7:4 >=dev-libs/qjson-0.5 )
 SLOT=0
 SRC_URI=https://github.com/apitrace/apitrace/tarball/5.0 -> apitrace-5.0.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
 _md5_=810aaf0d385c13dc30a8b7c96cd3d396
diff --git a/metadata/md5-cache/dev-util/apitrace-6.0 b/metadata/md5-cache/dev-util/apitrace-6.0
index 3c975ef351af..f9c18ddbb6fd 100644
--- a/metadata/md5-cache/dev-util/apitrace-6.0
+++ b/metadata/md5-cache/dev-util/apitrace-6.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=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(+)] >=app-arch/snappy-1.1.1[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(-)?] >=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(-)?] >=media-libs/mesa-9.1.6[egl?,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(-)?] egl? ( || ( >=media-libs/mesa-8.0[gles1,gles2] <media-libs/mesa-8.0[gles] ) ) media-libs/libpng:0= sys-process/procps x11-libs/libX11 qt4? ( >=dev-qt/qtcore-4.7:4 >=dev-qt/qtgui-4.7:4 >=dev-qt/qtwebkit-4.7:4 >=dev-libs/qjson-0.5 )
 SLOT=0
 SRC_URI=https://github.com/apitrace/apitrace/archive/6.0.tar.gz -> apitrace-6.0.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e83d9e0e157c30185de8dc946e5c95ac
diff --git a/metadata/md5-cache/dev-util/apitrace-6.1 b/metadata/md5-cache/dev-util/apitrace-6.1
index 971022f46a4c..974669fccdd2 100644
--- a/metadata/md5-cache/dev-util/apitrace-6.1
+++ b/metadata/md5-cache/dev-util/apitrace-6.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=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(+)] >=app-arch/snappy-1.1.1[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(-)?] >=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(-)?] >=media-libs/mesa-9.1.6[egl?,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(-)?] egl? ( || ( >=media-libs/mesa-8.0[gles1,gles2] <media-libs/mesa-8.0[gles] ) ) media-libs/libpng:0= sys-process/procps x11-libs/libX11 qt4? ( >=dev-qt/qtcore-4.7:4 >=dev-qt/qtgui-4.7:4 >=dev-qt/qtwebkit-4.7:4 >=dev-libs/qjson-0.5 )
 SLOT=0
 SRC_URI=https://github.com/apitrace/apitrace/archive/6.1.tar.gz -> apitrace-6.1.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=38911bba6c7c1da7fbdf865a3a226b40
diff --git a/metadata/md5-cache/dev-util/buildbot-0.8.12 b/metadata/md5-cache/dev-util/buildbot-0.8.12
index 3cdd3cdbaa0e..dc0ef5c06e01 100644
--- a/metadata/md5-cache/dev-util/buildbot-0.8.12
+++ b/metadata/md5-cache/dev-util/buildbot-0.8.12
@@ -4,11 +4,11 @@ DESCRIPTION=BuildBot build automation system
 EAPI=5
 HOMEPAGE=http://trac.buildbot.net/ http://code.google.com/p/buildbot/ http://pypi.python.org/pypi/buildbot
 IUSE=doc examples irc mail manhole test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-python/jinja-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-web[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sqlalchemy-migrate[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] irc? ( dev-python/twisted-words[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mail? ( dev-python/twisted-mail[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) manhole? ( dev-python/twisted-conch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=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/b/buildbot/buildbot-0.8.12.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=ccc9acc47c1286e08397044eba80c57f
+_md5_=1119e0021d3525b8e329d4f04ce189c7
diff --git a/metadata/md5-cache/dev-util/buildbot-slave-0.8.12 b/metadata/md5-cache/dev-util/buildbot-slave-0.8.12
index 291b56977512..74da029bac39 100644
--- a/metadata/md5-cache/dev-util/buildbot-slave-0.8.12
+++ b/metadata/md5-cache/dev-util/buildbot-slave-0.8.12
@@ -4,11 +4,11 @@ DESCRIPTION=BuildBot Slave Daemon
 EAPI=5
 HOMEPAGE=http://trac.buildbot.net/ http://code.google.com/p/buildbot/ http://pypi.python.org/pypi/buildbot-slave
 IUSE=test python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-interix ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/twisted-core[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/b/buildbot-slave/buildbot-slave-0.8.12.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=667e4359913d3f48190ab3db2a72bcdb
+_md5_=eff9627bcdecb7f7004cba0196310b5f
diff --git a/metadata/md5-cache/dev-util/cmocka-0.3.1-r1 b/metadata/md5-cache/dev-util/cmocka-0.3.1-r1
index e355c9119dc6..b7b513a82994 100644
--- a/metadata/md5-cache/dev-util/cmocka-0.3.1-r1
+++ b/metadata/md5-cache/dev-util/cmocka-0.3.1-r1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://open.cryptomilk.org/attachments/download/19/cmocka-0.3.1.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=fb6f5406a0093285a6259e85a72c6e05
diff --git a/metadata/md5-cache/dev-util/cmocka-0.4.1 b/metadata/md5-cache/dev-util/cmocka-0.4.1
index 9c5c6cc8d2e5..f04fb9772172 100644
--- a/metadata/md5-cache/dev-util/cmocka-0.4.1
+++ b/metadata/md5-cache/dev-util/cmocka-0.4.1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 sparc x86 ~x86-fbsd ~amd64-linux
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://open.cryptomilk.org/attachments/download/42/cmocka-0.4.1.tar.xz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6b9716bacb983872624e4052b4968eef
diff --git a/metadata/md5-cache/dev-util/cmocka-1.0.1 b/metadata/md5-cache/dev-util/cmocka-1.0.1
index 5f014492e9cf..c8c25569b2de 100644
--- a/metadata/md5-cache/dev-util/cmocka-1.0.1
+++ b/metadata/md5-cache/dev-util/cmocka-1.0.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://cmocka.org/files/1.0/cmocka-1.0.1.tar.xz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=63246dc88651e02faa76a4750d2faed4
diff --git a/metadata/md5-cache/dev-util/cppunit-1.13.2-r2 b/metadata/md5-cache/dev-util/cppunit-1.13.2-r2
index d75ae14766fa..3ff0d5c0ed1d 100644
--- a/metadata/md5-cache/dev-util/cppunit-1.13.2-r2
+++ b/metadata/md5-cache/dev-util/cppunit-1.13.2-r2
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c70c44dd57742740129269accfb3aa53
diff --git a/metadata/md5-cache/dev-util/cppunit-9999 b/metadata/md5-cache/dev-util/cppunit-9999
index 7b4ddc223145..ed9360513b55 100644
--- a/metadata/md5-cache/dev-util/cppunit-9999
+++ b/metadata/md5-cache/dev-util/cppunit-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://www.freedesktop.org/wiki/Software/cppunit
 IUSE=doc examples 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
 LICENSE=LGPL-2.1
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6cc1436e878148cf9eea3f5439214176
diff --git a/metadata/md5-cache/dev-util/cunit-2.1_p2-r1 b/metadata/md5-cache/dev-util/cunit-2.1_p2-r1
index 5aad49cb00cc..25d34b42ad64 100644
--- a/metadata/md5-cache/dev-util/cunit-2.1_p2-r1
+++ b/metadata/md5-cache/dev-util/cunit-2.1_p2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5.9-r3[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
 SRC_URI=mirror://sourceforge/cunit/CUnit-2.1-2-src.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b9991433c64e84ceaf2201c04e6806bd
diff --git a/metadata/md5-cache/dev-util/pkgconf-0.9.3-r1 b/metadata/md5-cache/dev-util/pkgconf-0.9.3-r1
index 4973803f9428..53e31961390b 100644
--- a/metadata/md5-cache/dev-util/pkgconf-0.9.3-r1
+++ b/metadata/md5-cache/dev-util/pkgconf-0.9.3-r1
@@ -8,5 +8,5 @@ LICENSE=BSD-1
 RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
 SLOT=0
 SRC_URI=http://tortois.es/~nenolod/distfiles/pkgconf-0.9.3.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8b10285f4af5c2cd79618a4f9374ee23
diff --git a/metadata/md5-cache/dev-util/pkgconf-0.9.6 b/metadata/md5-cache/dev-util/pkgconf-0.9.6
index 7631f9092c6c..945a8244a254 100644
--- a/metadata/md5-cache/dev-util/pkgconf-0.9.6
+++ b/metadata/md5-cache/dev-util/pkgconf-0.9.6
@@ -8,5 +8,5 @@ LICENSE=BSD-1
 RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
 SLOT=0
 SRC_URI=http://rabbit.dereferenced.org/~nenolod/distfiles/pkgconf-0.9.6.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8dfd82e6d480f3a85ded5b0b90024536
diff --git a/metadata/md5-cache/dev-util/pkgconf-0.9.8 b/metadata/md5-cache/dev-util/pkgconf-0.9.8
index 29147d515fec..7bf8e6fe3a77 100644
--- a/metadata/md5-cache/dev-util/pkgconf-0.9.8
+++ b/metadata/md5-cache/dev-util/pkgconf-0.9.8
@@ -8,5 +8,5 @@ LICENSE=BSD-1
 RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
 SLOT=0
 SRC_URI=http://rabbit.dereferenced.org/~nenolod/distfiles/pkgconf-0.9.8.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b58d18e578fe0f857ca2e7414eda5e15
diff --git a/metadata/md5-cache/dev-util/pkgconf-9999 b/metadata/md5-cache/dev-util/pkgconf-9999
index a803175b6a82..754fa942f2ec 100644
--- a/metadata/md5-cache/dev-util/pkgconf-9999
+++ b/metadata/md5-cache/dev-util/pkgconf-9999
@@ -7,5 +7,5 @@ IUSE=+pkg-config strict abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_
 LICENSE=BSD-1
 RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=30eed7c1d0b13ef7ea988d6fd886e6b0
diff --git a/metadata/md5-cache/dev-util/pkgconfig-0.28-r2 b/metadata/md5-cache/dev-util/pkgconfig-0.28-r2
index 98d66adde87e..d024abef854a 100644
--- a/metadata/md5-cache/dev-util/pkgconfig-0.28-r2
+++ b/metadata/md5-cache/dev-util/pkgconfig-0.28-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[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(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config]
 SLOT=0
 SRC_URI=http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7451be525fa4ec79f973f00bc5774b03
diff --git a/metadata/md5-cache/dev-util/pkgconfig-0.28-r3 b/metadata/md5-cache/dev-util/pkgconfig-0.28-r3
index ab4faa84a6c9..b49e0e178663 100644
--- a/metadata/md5-cache/dev-util/pkgconfig-0.28-r3
+++ b/metadata/md5-cache/dev-util/pkgconfig-0.28-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[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(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config]
 SLOT=0
 SRC_URI=http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=3fcaf134c4f5add231c16348c50de02f
diff --git a/metadata/md5-cache/dev-util/pkgconfig-9999 b/metadata/md5-cache/dev-util/pkgconfig-9999
index 56e10cdf5bef..0e67ddb8aa75 100644
--- a/metadata/md5-cache/dev-util/pkgconfig-9999
+++ b/metadata/md5-cache/dev-util/pkgconfig-9999
@@ -7,5 +7,5 @@ IUSE=elibc_FreeBSD elibc_glibc hardened internal-glib abi_x86_32 abi_x86_64 abi_
 LICENSE=GPL-2
 RDEPEND=!internal-glib? ( >=dev-libs/glib-2.34.3[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(-)?] ) !dev-util/pkgconf[pkg-config] !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config]
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a7660f00b0c5211102f5062697c7d363
diff --git a/metadata/md5-cache/dev-util/pkgconfig-openbsd-20130507-r1 b/metadata/md5-cache/dev-util/pkgconfig-openbsd-20130507-r1
index 9767b3fc051b..c308b87963a5 100644
--- a/metadata/md5-cache/dev-util/pkgconfig-openbsd-20130507-r1
+++ b/metadata/md5-cache/dev-util/pkgconfig-openbsd-20130507-r1
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=virtual/perl-Getopt-Long pkg-config? ( !dev-util/pkgconfig !dev-util/pkgconf[pkg-config] ) dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ssuominen/pkgconfig-openbsd-20130507.tar.xz pkg-config? ( http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
 _md5_=9999ef2896583da78bc9df80939ed881
diff --git a/metadata/md5-cache/dev-util/scala-ide-4.1.0 b/metadata/md5-cache/dev-util/scala-ide-4.1.0
new file mode 100644
index 000000000000..60ebb2ed36be
--- /dev/null
+++ b/metadata/md5-cache/dev-util/scala-ide-4.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install preinst prepare setup unpack
+DEPEND=>=virtual/jdk-1.6 || ( dev-lang/scala dev-lang/scala-bin ) java? ( >=dev-java/java-config-2.2.0 )
+DESCRIPTION=The Scala IDE
+EAPI=5
+HOMEPAGE=http://www.scala-ide.org
+IUSE=elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=virtual/jre-1.6 java? ( >=dev-java/java-config-2.2.0 )
+SLOT=0
+SRC_URI=amd64? ( http://downloads.typesafe.com/scalaide-pack/4.1.0-vfinal-luna-211-20150525/scala-SDK-4.1.0-vfinal-2.11-linux.gtk.x86_64.tar.gz ) x86? ( http://downloads.typesafe.com/scalaide-pack/4.1.0-vfinal-luna-211-20150525/scala-SDK-4.1.0-vfinal-2.11-linux.gtk.x86.tar.gz )
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=aa9aa9003f8bb465227e4e881ca6539f
diff --git a/metadata/md5-cache/dev-util/trinity-1.5 b/metadata/md5-cache/dev-util/trinity-1.5
new file mode 100644
index 000000000000..7f3a5a6e921a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/trinity-1.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=app-arch/xz-utils sys-kernel/linux-headers
+DESCRIPTION=A Linux system call fuzz tester
+EAPI=5
+HOMEPAGE=http://codemonkey.org.uk/projects/trinity/
+IUSE=examples
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://codemonkey.org.uk/projects/trinity/trinity-1.5.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=b97b982b7334df04fae4fa5946640086
diff --git a/metadata/md5-cache/dev-util/umockdev-0.8.10 b/metadata/md5-cache/dev-util/umockdev-0.8.10
new file mode 100644
index 000000000000..5d4b1d8e195c
--- /dev/null
+++ b/metadata/md5-cache/dev-util/umockdev-0.8.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=virtual/libgudev:= virtual/libudev:= >=dev-libs/glib-2.32:2 test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python:3.4 >=dev-lang/python-3.3.2-r2:3.3 ) ) app-arch/xz-utils virtual/pkgconfig
+DESCRIPTION=Mock hardware devices for creating unit tests
+EAPI=5
+HOMEPAGE=https://github.com/martinpitt/umockdev/
+IUSE=static-libs test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=virtual/libgudev:= virtual/libudev:= >=dev-libs/glib-2.32:2
+RESTRICT=test
+SLOT=0
+SRC_URI=http://launchpad.net/umockdev/trunk/0.8.10/+download/umockdev-0.8.10.tar.xz
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=11ccc9442cbba8f5128f36c487e3eaec
diff --git a/metadata/md5-cache/dev-util/weka-3.6.12 b/metadata/md5-cache/dev-util/weka-3.6.12
new file mode 100644
index 000000000000..5916b1acb4dd
--- /dev/null
+++ b/metadata/md5-cache/dev-util/weka-3.6.12
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 app-arch/unzip >=dev-java/javacup-0.11a_beta20060608:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=A Java data mining package
+EAPI=5
+HOMEPAGE=http://www.cs.waikato.ac.nz/ml/weka/
+IUSE=elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=virtual/jre-1.6 >=dev-java/javacup-0.11a_beta20060608:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://sourceforge/weka/weka-3-6-12.zip
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=3666646029eee11d8ba5db00c246d43d
diff --git a/metadata/md5-cache/dev-util/weka-3.6.6-r1 b/metadata/md5-cache/dev-util/weka-3.6.6-r1
index 4821af486992..0498dda96c21 100644
--- a/metadata/md5-cache/dev-util/weka-3.6.6-r1
+++ b/metadata/md5-cache/dev-util/weka-3.6.6-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install preinst prepare setup
 DEPEND=>=virtual/jdk-1.5 app-arch/unzip >=dev-java/javacup-0.11a_beta20060608:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=A Java data mining package
-EAPI=3
+EAPI=5
 HOMEPAGE=http://www.cs.waikato.ac.nz/ml/weka/
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
 KEYWORDS=amd64 ppc x86
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.5 >=dev-java/javacup-0.11a_beta20060608:0 >=dev-java/jav
 SLOT=0
 SRC_URI=mirror://sourceforge/weka/weka-3-6-6.zip
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	6627198e505d021534cb20f89279c509	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=bcc10da5e9c6d3dcebd1fb3d3722f324
+_md5_=3bee69127b2b70f3b44c20895a936db5
diff --git a/metadata/md5-cache/dev-vcs/cvs2cl-2.59 b/metadata/md5-cache/dev-vcs/cvs2cl-2.59
deleted file mode 100644
index 64515d93f51b..000000000000
--- a/metadata/md5-cache/dev-vcs/cvs2cl-2.59
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/perl
-DESCRIPTION=produces a GNU-style ChangeLog for CVS-controlled sources
-HOMEPAGE=http://www.red-bean.com/cvs2cl/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=mirror://gentoo/cvs2cl-2.59.pl.bz2
-_md5_=a3c0e45d401c8dfd7b361ea21cf904ea
diff --git a/metadata/md5-cache/dev-vcs/cvsd-1.0.16 b/metadata/md5-cache/dev-vcs/cvsd-1.0.16
deleted file mode 100644
index bfbdf843f5c6..000000000000
--- a/metadata/md5-cache/dev-vcs/cvsd-1.0.16
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=>=dev-vcs/cvs-1.11.6 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-DESCRIPTION=CVS pserver daemon
-HOMEPAGE=http://ch.tudelft.nl/~arthur/cvsd/
-IUSE=tcpd
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/cvs-1.11.6 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-lang/perl-5.8.0
-SLOT=0
-SRC_URI=http://ch.tudelft.nl/~arthur/cvsd/cvsd-1.0.16.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=e7ed2c6bf941076d2d4c36e50f5adb2c
diff --git a/metadata/md5-cache/dev-vcs/cvsd-1.0.8 b/metadata/md5-cache/dev-vcs/cvsd-1.0.8
deleted file mode 100644
index e592a474e62b..000000000000
--- a/metadata/md5-cache/dev-vcs/cvsd-1.0.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst setup
-DEPEND=tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-DESCRIPTION=CVS pserver daemon
-HOMEPAGE=http://ch.tudelft.nl/~arthur/cvsd/
-IUSE=tcpd
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-lang/perl-5.8.0 >=dev-vcs/cvs-1.11.6
-SLOT=0
-SRC_URI=http://ch.tudelft.nl/~arthur/cvsd/cvsd-1.0.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=f40eba5e44b2b494d923fbf5f23c3ce8
diff --git a/metadata/md5-cache/dev-vcs/git-2.3.7 b/metadata/md5-cache/dev-vcs/git-2.3.7
deleted file mode 100644
index 4568842d83ad..000000000000
--- a/metadata/md5-cache/dev-vcs/git-2.3.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=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 ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DESCRIPTION=GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team
-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
-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? ( dev-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.7.tar.xz mirror://kernel/software/scm/git/git-2.3.7.tar.xz http://git-core.googlecode.com/files/git-manpages-2.3.7.tar.xz mirror://kernel/software/scm/git/git-manpages-2.3.7.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.3.7.tar.xz http://git-core.googlecode.com/files/git-htmldocs-2.3.7.tar.xz )
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	elisp-common	9a16929c1a6aec7e1c903289983e114c	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=db971f61c0d8f0e8d66824f6405ca01c
diff --git a/metadata/md5-cache/dev-vcs/git-2.4.3 b/metadata/md5-cache/dev-vcs/git-2.4.5
similarity index 89%
rename from metadata/md5-cache/dev-vcs/git-2.4.3
rename to metadata/md5-cache/dev-vcs/git-2.4.5
index 80e81007fa5f..746e0af9c922 100644
--- a/metadata/md5-cache/dev-vcs/git-2.4.3
+++ b/metadata/md5-cache/dev-vcs/git-2.4.5
@@ -9,6 +9,6 @@ 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? ( dev-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.4.3.tar.xz mirror://kernel/software/scm/git/git-2.4.3.tar.xz http://git-core.googlecode.com/files/git-manpages-2.4.3.tar.xz mirror://kernel/software/scm/git/git-manpages-2.4.3.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.4.3.tar.xz http://git-core.googlecode.com/files/git-htmldocs-2.4.3.tar.xz )
+SRC_URI=http://git-core.googlecode.com/files/git-2.4.5.tar.xz mirror://kernel/software/scm/git/git-2.4.5.tar.xz http://git-core.googlecode.com/files/git-manpages-2.4.5.tar.xz mirror://kernel/software/scm/git/git-manpages-2.4.5.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.4.5.tar.xz http://git-core.googlecode.com/files/git-htmldocs-2.4.5.tar.xz )
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	elisp-common	9a16929c1a6aec7e1c903289983e114c	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=7473f1c176101ffafe6292f33cf7515c
+_md5_=7b7fc2afa4210a21bebb37c13b426eeb
diff --git a/metadata/md5-cache/games-action/cs2d-0127 b/metadata/md5-cache/games-action/cs2d-0127
new file mode 100644
index 000000000000..8a33cebdb768
--- /dev/null
+++ b/metadata/md5-cache/games-action/cs2d-0127
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Counter-Strike 2D is freeware clone of Counter-Strike with some added features in gameplay
+EAPI=5
+HOMEPAGE=http://www.cs2d.com/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=freedist
+RDEPEND=x86? ( media-libs/openal media-libs/freetype:2 x11-libs/libX11 x11-libs/libXxf86vm virtual/opengl ) amd64? ( >=media-libs/openal-1.15.1[abi_x86_32(-)] >=virtual/opengl-7.0-r1[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)] ) games-misc/games-envd
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~maksbotan/cs2d/cs2d_0127_linux.zip http://dev.gentoo.org/~maksbotan/cs2d/cs2d_0127_win.zip http://dev.gentoo.org/~maksbotan/cs2d/cs2d.png
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=86d4a57813ffdab64b3a5dd874b632c5
diff --git a/metadata/md5-cache/games-board/goatee-gtk-0.2.0-r1 b/metadata/md5-cache/games-board/goatee-gtk-0.2.0-r1
deleted file mode 100644
index e833b86c2062..000000000000
--- a/metadata/md5-cache/games-board/goatee-gtk-0.2.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-games/goatee-0.2:=[profile?] <dev-games/goatee-0.3:=[profile?] >=dev-haskell/cairo-0.12:=[profile?] <dev-haskell/cairo-0.13:=[profile?] >=dev-haskell/gtk-0.12:2=[profile?] <dev-haskell/gtk-0.13:2=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-libs/gmp-5:= virtual/libffi:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
-DESCRIPTION=A monadic take on a 2,500-year-old board game - GTK+ UI
-EAPI=5
-HOMEPAGE=http://khumba.net/projects/goatee
-IUSE=doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=>=dev-games/goatee-0.2:=[profile?] <dev-games/goatee-0.3:=[profile?] >=dev-haskell/cairo-0.12:=[profile?] <dev-haskell/cairo-0.13:=[profile?] >=dev-haskell/gtk-0.12:2=[profile?] <dev-haskell/gtk-0.13:2=[profile?] >=dev-haskell/mtl-2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-libs/gmp-5:= virtual/libffi:= games-misc/games-envd
-SLOT=0/0.2.0
-SRC_URI=mirror://hackage/packages/archive/goatee-gtk/0.2.0/goatee-gtk-0.2.0.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	ghc-package	48ae4e0fd75e1c8047c4b7f507d5debc	haskell-cabal	eee03ecca8dca7a927272dcea2ca53f4	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b1f0fce27cc539560149f004eebd3de5
diff --git a/metadata/md5-cache/games-puzzle/enigma-1.21-r1 b/metadata/md5-cache/games-puzzle/enigma-1.21-r1
index d21e68744637..dc97dbe23b4d 100644
--- a/metadata/md5-cache/games-puzzle/enigma-1.21-r1
+++ b/metadata/md5-cache/games-puzzle/enigma-1.21-r1
@@ -4,10 +4,10 @@ DESCRIPTION=puzzle game similar to Oxyd
 EAPI=5
 HOMEPAGE=http://www.nongnu.org/enigma/
 IUSE=nls
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2+
 RDEPEND=media-libs/sdl-ttf media-libs/libsdl[video] media-libs/sdl-mixer media-libs/sdl-image[jpeg,png] media-libs/libpng:0= sys-libs/zlib net-misc/curl || ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] ) net-libs/enet nls? ( virtual/libintl ) media-fonts/dejavu x11-misc/xdg-utils games-misc/games-envd
 SLOT=0
 SRC_URI=mirror://sourceforge/enigma-game/enigma-1.21.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=fe8dda939a9a9ae2f55c1127e99db811
+_md5_=69794d5761a89ef894a77b3311daa53b
diff --git a/metadata/md5-cache/games-rpg/manaplus-1.5.5.9 b/metadata/md5-cache/games-rpg/manaplus-1.5.6.20
similarity index 92%
rename from metadata/md5-cache/games-rpg/manaplus-1.5.5.9
rename to metadata/md5-cache/games-rpg/manaplus-1.5.6.20
index a3e6b9569315..87b9cbda602a 100644
--- a/metadata/md5-cache/games-rpg/manaplus-1.5.5.9
+++ b/metadata/md5-cache/games-rpg/manaplus-1.5.6.20
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-games/physfs-1.0.0 dev-libs/libxml2 media-libs/libpng:0= media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf net-misc/curl sys-libs/zlib x11-libs/libX11 x11-misc/xdg-utils x11-apps/xmessage media-fonts/dejavu media-fonts/wqy-microhei media-fonts/liberation-fonts media-fonts/mplus-outline-fonts nls? ( virtual/libintl ) opengl? ( virtual/opengl ) games-misc/games-envd
 SLOT=0
-SRC_URI=http://download.evolonline.org/manaplus/download/1.5.5.9/manaplus-1.5.5.9.tar.xz
+SRC_URI=http://download.evolonline.org/manaplus/download/1.5.6.20/manaplus-1.5.6.20.tar.xz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=f8a6bed34936a2d18e39d5fd5fff42ea
+_md5_=db2f15f80efa925fb93648b8556b9ba0
diff --git a/metadata/md5-cache/games-rpg/manaplus-1.5.6.6 b/metadata/md5-cache/games-rpg/manaplus-1.5.6.6
deleted file mode 100644
index d43ec2eec852..000000000000
--- a/metadata/md5-cache/games-rpg/manaplus-1.5.6.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=dev-games/physfs-1.0.0 dev-libs/libxml2 media-libs/libpng:0= media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf net-misc/curl sys-libs/zlib x11-libs/libX11 x11-misc/xdg-utils x11-apps/xmessage media-fonts/dejavu media-fonts/wqy-microhei media-fonts/liberation-fonts media-fonts/mplus-outline-fonts nls? ( virtual/libintl ) opengl? ( virtual/opengl ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=OpenSource 2D MMORPG client for Evol Online and The Mana World
-EAPI=5
-HOMEPAGE=http://manaplus.evolonline.org
-IUSE=nls opengl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-games/physfs-1.0.0 dev-libs/libxml2 media-libs/libpng:0= media-libs/libsdl2[X,opengl?,video] media-libs/sdl2-gfx media-libs/sdl2-image[png] media-libs/sdl2-mixer[vorbis] media-libs/sdl2-net media-libs/sdl2-ttf net-misc/curl sys-libs/zlib x11-libs/libX11 x11-misc/xdg-utils x11-apps/xmessage media-fonts/dejavu media-fonts/wqy-microhei media-fonts/liberation-fonts media-fonts/mplus-outline-fonts nls? ( virtual/libintl ) opengl? ( virtual/opengl ) games-misc/games-envd
-SLOT=0
-SRC_URI=http://download.evolonline.org/manaplus/download/1.5.6.6/manaplus-1.5.6.6.tar.xz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=4d097503aef96324529c1f7aca8f9f94
diff --git a/metadata/md5-cache/games-rpg/wasteland2-1.3.0.7 b/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13
similarity index 54%
rename from metadata/md5-cache/games-rpg/wasteland2-1.3.0.7
rename to metadata/md5-cache/games-rpg/wasteland2-1.9.0.13
index 61c9f77eef80..b7dd1c05e54e 100644
--- a/metadata/md5-cache/games-rpg/wasteland2-1.3.0.7
+++ b/metadata/md5-cache/games-rpg/wasteland2-1.9.0.13
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=https://wasteland.inxile-entertainment.com/
 KEYWORDS=~amd64 ~x86
 LICENSE=all-rights-reserved
-RDEPEND=virtual/opengl >=dev-libs/atk-2.12.0-r1[abi_x86_32(-)] >=dev-libs/glib-2.40.0-r1:2[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92:1.0[abi_x86_32(-)] >=media-libs/freetype-2.5.3-r1:2[abi_x86_32(-)] >=x11-libs/cairo-1.12.16-r2[abi_x86_32(-)] >=x11-libs/gdk-pixbuf-2.30.8:2[abi_x86_32(-)] >=x11-libs/gtk+-2.24.24:2[abi_x86_32(-)] >=x11-libs/pango-1.36.5[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=virtual/glu-9.0-r1[abi_x86_32(-)] games-misc/games-envd
+RDEPEND=>=dev-libs/atk-2.12.0-r1[abi_x86_32(-)] >=dev-libs/glib-2.40.0-r1:2[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92:1.0[abi_x86_32(-)] >=media-libs/freetype-2.5.3-r1:2[abi_x86_32(-)] >=x11-libs/cairo-1.12.16-r2[abi_x86_32(-)] >=x11-libs/gdk-pixbuf-2.30.8:2[abi_x86_32(-)] >=x11-libs/gtk+-2.24.24:2[abi_x86_32(-)] >=x11-libs/pango-1.36.5[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)] >=virtual/glu-9.0-r1[abi_x86_32(-)] virtual/opengl games-misc/games-envd
 RESTRICT=bindist fetch mirror
 SLOT=0
-SRC_URI=gog_wasteland_2_1.3.0.7.tar.gz
+SRC_URI=gog_wasteland_2_1.9.0.13.tar.gz
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=462b789e2050fa003ea9b667bb9f575d
+_md5_=d3c9b73c984e9d8c32e96073b427bda1
diff --git a/metadata/md5-cache/games-simulation/simutrans-0.112.3 b/metadata/md5-cache/games-simulation/simutrans-0.112.3
deleted file mode 100644
index e882a2cebd2b..000000000000
--- a/metadata/md5-cache/games-simulation/simutrans-0.112.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=media-libs/libsdl[sound,video] sys-libs/zlib app-arch/bzip2 media-libs/libpng:0 media-libs/sdl-mixer app-arch/unzip
-DESCRIPTION=A free Transport Tycoon clone
-EAPI=5
-HOMEPAGE=http://www.simutrans.com/
-KEYWORDS=-* amd64 x86
-LICENSE=Artistic
-RDEPEND=media-libs/libsdl[sound,video] sys-libs/zlib app-arch/bzip2 media-libs/libpng:0 media-libs/sdl-mixer games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/simutrans/simutrans-src-112-3.zip mirror://sourceforge/simutrans/simulinux-112-3.zip mirror://sourceforge/simutrans/simupak64-112-3.zip
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	games	1ad3205dbf62a2c98249f2f59b0a2d39	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=ea670f5ec8f288de7e04ac9f349ac5d4
diff --git a/metadata/md5-cache/games-util/joystick-1.4.8-r1 b/metadata/md5-cache/games-util/joystick-1.4.8-r1
index fba681674412..61ab781bf742 100644
--- a/metadata/md5-cache/games-util/joystick-1.4.8-r1
+++ b/metadata/md5-cache/games-util/joystick-1.4.8-r1
@@ -4,10 +4,10 @@ DESCRIPTION=joystick testing utilities
 EAPI=5
 HOMEPAGE=http://sourceforge.net/projects/linuxconsole/ http://atrey.karlin.mff.cuni.cz/~vojtech/input/
 IUSE=sdl udev
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2
 RDEPEND=sdl? ( media-libs/libsdl:0[video] ) !<x11-libs/tslib-1.0-r2 udev? ( virtual/udev )
 SLOT=0
 SRC_URI=mirror://sourceforge/linuxconsole/files/linuxconsoletools-1.4.8.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=38cd885a487d959f4b2535b1ee6e2ffc
+_md5_=0ede7770eb3c4308c8dcc2d93244ab45
diff --git a/metadata/md5-cache/games-util/lutris-0.3.6.2 b/metadata/md5-cache/games-util/lutris-0.3.6.2
deleted file mode 100644
index f74e21d8fd53..000000000000
--- a/metadata/md5-cache/games-util/lutris-0.3.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/sed-4
-DESCRIPTION=Gaming platform for GNU/Linux
-EAPI=5
-HOMEPAGE=http://lutris.net/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gnome-base/gvfs[http] x11-apps/xrandr x11-apps/xgamma x11-misc/xdg-utils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] games-misc/games-envd
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/lutris/lutris/archive/v0.3.6.2.tar.gz -> lutris-0.3.6.2.tar.gz
-_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	games	1ad3205dbf62a2c98249f2f59b0a2d39	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=1106a067ca36b243e756fa0ca4200105
diff --git a/metadata/md5-cache/games-util/nml-0.4.1 b/metadata/md5-cache/games-util/nml-0.4.1
index c229c70349de..e8575709fb62 100644
--- a/metadata/md5-cache/games-util/nml-0.4.1
+++ b/metadata/md5-cache/games-util/nml-0.4.1
@@ -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.1/nml-0.4.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=ea71c5a4f495613bf85be3bf61f79ae5
+_md5_=150478f9b906986b47ae07783c27d84a
diff --git a/metadata/md5-cache/games-util/pyfa-1.11.0 b/metadata/md5-cache/games-util/pyfa-1.12.0
similarity index 91%
rename from metadata/md5-cache/games-util/pyfa-1.11.0
rename to metadata/md5-cache/games-util/pyfa-1.12.0
index 2e124b1a4394..2f2b9c88c7de 100644
--- a/metadata/md5-cache/games-util/pyfa-1.11.0
+++ b/metadata/md5-cache/games-util/pyfa-1.12.0
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3+ LGPL-2.1+ CC-BY-2.5 free-noncomm
 RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:2.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] graph? ( dev-python/matplotlib[wxwidgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] 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[sqlite,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
-SRC_URI=https://github.com/DarkFenX/Pyfa/archive/v1.11.0.tar.gz -> pyfa-1.11.0.tar.gz
+SRC_URI=https://github.com/DarkFenX/Pyfa/archive/v1.12.0.tar.gz -> pyfa-1.12.0.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=0f006c681a651eddf47498245242c32c
+_md5_=b42b622b09dfe8fc8a6dd3045df6bebc
diff --git a/metadata/md5-cache/gnome-base/gconf-3.2.6-r3 b/metadata/md5-cache/gnome-base/gconf-3.2.6-r3
index 6996abb45a41..9ad49076acaa 100644
--- a/metadata/md5-cache/gnome-base/gconf-3.2.6-r3
+++ b/metadata/md5-cache/gnome-base/gconf-3.2.6-r3
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=mirror://gnome/sources/GConf/3.2/GConf-3.2.6.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9958f84fa82530a7a6e9f9f9d4662164
diff --git a/metadata/md5-cache/gnome-base/gnome-3.16.0 b/metadata/md5-cache/gnome-base/gnome-3.16.0
index 516183f93f84..9b48ede1044d 100644
--- a/metadata/md5-cache/gnome-base/gnome-3.16.0
+++ b/metadata/md5-cache/gnome-base/gnome-3.16.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=postinst
 DESCRIPTION=Meta package for GNOME 3, merge this package to install
 EAPI=5
 HOMEPAGE=http://www.gnome.org/
@@ -8,4 +8,4 @@ LICENSE=metapackage
 PDEPEND=>=gnome-base/gvfs-1.24[udisks]
 RDEPEND=>=gnome-base/gnome-core-libs-3.16.0[cups?] >=gnome-base/gnome-core-apps-3.16.0[cups?,bluetooth?,cdr?] >=gnome-base/gdm-3.16.0 >=x11-wm/mutter-3.16.0 >=gnome-base/gnome-shell-3.16.0[bluetooth?] >=x11-themes/gnome-backgrounds-3.16.0 x11-themes/sound-theme-freedesktop accessibility? ( >=app-accessibility/at-spi2-atk-2.16 >=app-accessibility/at-spi2-core-2.16 >=app-accessibility/caribou-0.4.18 >=app-accessibility/orca-3.16.0 >=gnome-extra/mousetweaks-3.12.0 ) classic? ( >=gnome-extra/gnome-shell-extensions-3.16.0 ) extras? ( >=gnome-base/gnome-extra-apps-3.16.0 )
 SLOT=2.0
-_md5_=ef18cc5039b964312576530e973192a7
+_md5_=82118f837483d0c94daff7aece3aa842
diff --git a/metadata/md5-cache/gnome-base/gnome-keyring-3.16.0-r1 b/metadata/md5-cache/gnome-base/gnome-keyring-3.16.0-r1
index 75ad86685eed..b9d6cec57884 100644
--- a/metadata/md5-cache/gnome-base/gnome-keyring-3.16.0-r1
+++ b/metadata/md5-cache/gnome-base/gnome-keyring-3.16.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=app-crypt/gcr-3.5.3:=[gtk] >=dev-libs/glib-2.38:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= >=sys-apps/dbus-1.1.1 caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) app-crypt/pinentry[gnome-keyring] >=app-crypt/gnupg-2.0.28 >=app-eselect/eselect-pinentry-0.5 app-text/docbook-xml-dtd:4.3 dev-libs/libxslt >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) filecaps? ( sys-libs/libcap ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=>=app-crypt/gcr-3.5.3:=[gtk] >=dev-libs/glib-2.38:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= >=sys-apps/dbus-1.1.1 caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) >=app-crypt/gnupg-2.0.28 >=app-eselect/eselect-pinentry-0.5 app-text/docbook-xml-dtd:4.3 dev-libs/libxslt >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) filecaps? ( sys-libs/libcap ) app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Password and keyring managing daemon
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/GnomeKeyring
 IUSE=+caps debug pam selinux +ssh-agent test +filecaps debug test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=app-crypt/gcr-3.5.3:=[gtk] >=dev-libs/glib-2.38:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= >=sys-apps/dbus-1.1.1 caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) app-crypt/pinentry[gnome-keyring] >=app-crypt/gnupg-2.0.28
+RDEPEND=>=app-crypt/gcr-3.5.3:=[gtk] >=dev-libs/glib-2.38:2 app-misc/ca-certificates >=dev-libs/libgcrypt-1.2.2:0= >=sys-apps/dbus-1.1.1 caps? ( sys-libs/libcap-ng ) pam? ( virtual/pam ) >=app-crypt/gnupg-2.0.28 app-crypt/pinentry[gnome-keyring]
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-keyring/3.16/gnome-keyring-3.16.0.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fcaps	eeefea88d5fef2853d4c1e3770340302	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d47d112acd95e6a8719594e4e9c57f57
+_md5_=e941e02585cd2ac97f837b67fcd19ce9
diff --git a/metadata/md5-cache/gnome-base/gnome-light-3.16.0 b/metadata/md5-cache/gnome-base/gnome-light-3.16.0
index 73b6d20a98dc..5ebcd8e87571 100644
--- a/metadata/md5-cache/gnome-base/gnome-light-3.16.0
+++ b/metadata/md5-cache/gnome-base/gnome-light-3.16.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=pretend
+DEFINED_PHASES=postinst pretend
 DESCRIPTION=Meta package for GNOME-Light, merge this package to install
 EAPI=5
 HOMEPAGE=http://www.gnome.org/
@@ -8,4 +8,4 @@ LICENSE=metapackage
 PDEPEND=>=gnome-base/gvfs-1.24.0
 RDEPEND=!gnome-base/gnome >=gnome-base/gnome-core-libs-3.16.0[cups?] >=gnome-base/gnome-session-3.16.0 >=gnome-base/gnome-menus-3.10.1:3 >=gnome-base/gnome-settings-daemon-3.16.0[cups?] >=gnome-base/gnome-control-center-3.16.0[cups?] >=gnome-base/nautilus-3.16.0 gnome-shell? ( >=x11-wm/mutter-3.16.0 >=gnome-base/gnome-shell-3.16.0 ) >=x11-themes/adwaita-icon-theme-3.16.0 >=x11-themes/gnome-themes-standard-3.16.0 >=x11-themes/gnome-backgrounds-3.16.0 >=x11-terms/gnome-terminal-3.16.0
 SLOT=2.0
-_md5_=79aba612d11fef36bb281ce4824f3cd4
+_md5_=f87187dfda1f7526b307cbba2368202d
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.14.3 b/metadata/md5-cache/gnome-base/gnome-shell-3.14.3
deleted file mode 100644
index d2fd66b6bd02..000000000000
--- a/metadata/md5-cache/gnome-base/gnome-shell-3.14.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.39.1:2 >=dev-libs/gjs-1.39 >=dev-libs/gobject-introspection-0.10.1 >=x11-libs/gtk+-3.13.2:3[introspection] >=media-libs/clutter-1.15.90:1.0[introspection] >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.8:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.14 >=gnome-base/gnome-keyring-3.3.90 gnome-base/libgnome-keyring >=gnome-extra/evolution-data-server-3.5.3:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 x11-libs/libXtst >=x11-wm/mutter-3.14.3[introspection] <x11-wm/mutter-3.15 >=x11-libs/startup-notification-0.11 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/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/dbus-glib dev-libs/libxml2:2 gnome-base/librsvg media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) networkmanager? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.8 >=net-misc/networkmanager-0.9.8[introspection] ) dev-libs/libxslt >=dev-util/gtk-doc-am-1.17 >=dev-util/intltool-0.40 gnome-base/gnome-common virtual/pkgconfig !!=dev-lang/spidermonkey-1.8.2* !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 virtual/pkgconfig
-DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
-IUSE=+bluetooth +i18n +networkmanager -openrc-force python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2+ LGPL-2+
-PDEPEND=>=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.8.3[bluetooth(+)?]
-RDEPEND=>=app-accessibility/at-spi2-atk-2.5.3 >=dev-libs/atk-2[introspection] >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.39.1:2 >=dev-libs/gjs-1.39 >=dev-libs/gobject-introspection-0.10.1 >=x11-libs/gtk+-3.13.2:3[introspection] >=media-libs/clutter-1.15.90:1.0[introspection] >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.8:0.6 >=gnome-base/gnome-desktop-3.7.90:3=[introspection] >=gnome-base/gsettings-desktop-schemas-3.14 >=gnome-base/gnome-keyring-3.3.90 gnome-base/libgnome-keyring >=gnome-extra/evolution-data-server-3.5.3:= >=media-libs/gstreamer-0.11.92:1.0 >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-libs/libXfixes-5.0 x11-libs/libXtst >=x11-wm/mutter-3.14.3[introspection] <x11-wm/mutter-3.15 >=x11-libs/startup-notification-0.11 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/pygobject:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/dbus-glib dev-libs/libxml2:2 gnome-base/librsvg media-libs/libcanberra[gtk3] media-libs/mesa >=media-sound/pulseaudio-2 >=net-libs/libsoup-2.40:2.4[introspection] x11-libs/libX11 x11-libs/gdk-pixbuf:2[introspection] x11-libs/pango[introspection] x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) networkmanager? ( app-crypt/libsecret >=gnome-extra/nm-applet-0.9.8 >=net-misc/networkmanager-0.9.8[introspection] ) >=sys-auth/polkit-0.101[introspection] >=app-accessibility/caribou-0.4.8 media-libs/cogl[introspection] >=sys-apps/accountsservice-0.6.14[introspection] >=sys-power/upower-0.99[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 !openrc-force? ( >=sys-apps/systemd-31 ) x11-misc/xdg-utils media-fonts/dejavu x11-themes/gnome-icon-theme-symbolic i18n? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk3,introspection] ) networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-shell/3.14/gnome-shell-3.14.3.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f43f3c986f942d7731f3df9d638b32b0
diff --git a/metadata/md5-cache/gnome-base/gnome-vfs-2.24.4-r2 b/metadata/md5-cache/gnome-base/gnome-vfs-2.24.4-r2
index 2cb5e1f95e6f..48947868dbc0 100644
--- a/metadata/md5-cache/gnome-base/gnome-vfs-2.24.4-r2
+++ b/metadata/md5-cache/gnome-base/gnome-vfs-2.24.4-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=gnome-base/gconf-2.32.4-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(-)?] >=dev-libs/glib-2.34.3[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(-)?] >=dev-libs/libxml2-2.9.1-r4[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(-)?] >=app-arch/bzip2-1.0.6-r4[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(-)?] gnome-base/gnome-mime-data >=x11-misc/shared-mime-info-0.14 >=dev-libs/dbus-glib-0.100.2[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(-)?] acl? ( >=sys-apps/acl-2.2.52-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(-)?] >=sys-apps/attr-2.4.47-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(-)?] ) avahi? ( >=net-dns/avahi-0.6.31-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(-)?] ) kerberos? ( >=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(-)?] ) fam? ( >=virtual/fam-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(-)?] ) samba? ( >=net-fs/samba-3.6.23-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(-)?] ) ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6[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(-)?] !gnome-extra/gnome-vfs-sftp ) !gnutls? ( >=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(-)?] !gnome-extra/gnome-vfs-sftp ) ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20140508-r1 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gnome-vfs/2.24/gnome-vfs-2.24.4.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=8ccc7b16df34c0f668fc391bc181e808
diff --git a/metadata/md5-cache/gnome-base/libglade-2.6.4-r2 b/metadata/md5-cache/gnome-base/libglade-2.6.4-r2
index 5a72927ced5c..4cd92c832060 100644
--- a/metadata/md5-cache/gnome-base/libglade-2.6.4-r2
+++ b/metadata/md5-cache/gnome-base/libglade-2.6.4-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=tools? ( ^^ ( python_single_target_pypy python_single_target_python2_7 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 ) )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=4f65e380ae53bc705fbca5a31fbc3d97
diff --git a/metadata/md5-cache/gnome-base/libgnomecanvas-2.30.3-r1 b/metadata/md5-cache/gnome-base/libgnomecanvas-2.30.3-r1
index 3b7ffd6f3167..73912d255757 100644
--- a/metadata/md5-cache/gnome-base/libgnomecanvas-2.30.3-r1
+++ b/metadata/md5-cache/gnome-base/libgnomecanvas-2.30.3-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] >=x11-libs/gtk+-2.24.23:2[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(-)?] >=media-libs/libart_lgpl-2.3.21-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(-)?] >=x11-libs/pango-1.36.3[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(-)?] glade? ( >=gnome-base/libglade-2.6.4-r1:2.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(-)?] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libgnomecanvas/2.30/libgnomecanvas-2.30.3.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=f4b839051560c07dfb4f4491724bfaf9
diff --git a/metadata/md5-cache/gnome-base/libgnomeprint-2.18.8-r1 b/metadata/md5-cache/gnome-base/libgnomeprint-2.18.8-r1
index 40c813dfe5f9..4b64e01e82e0 100644
--- a/metadata/md5-cache/gnome-base/libgnomeprint-2.18.8-r1
+++ b/metadata/md5-cache/gnome-base/libgnomeprint-2.18.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.34.3[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(-)?] >=media-libs/libart_lgpl-2.3.21-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(-)?] >=x11-libs/pango-1.36.3[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(-)?] >=dev-libs/libxml2-2.9.1-r4[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(-)?] >=media-libs/fontconfig-2.10.92[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(-)?] >=media-libs/freetype-2.5.0.1[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(-)?] >=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(-)?] cups? ( >=net-print/cups-1.7.1-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(-)?] >=net-print/libgnomecups-0.2.3-r3[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=2.2
 SRC_URI=mirror://gnome/sources/libgnomeprint/2.18/libgnomeprint-2.18.8.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a10558671335268c2c3055e3204beeca
diff --git a/metadata/md5-cache/gnome-base/libgnomeprintui-2.18.6-r1 b/metadata/md5-cache/gnome-base/libgnomeprintui-2.18.6-r1
index c8533d724267..c2d214a7dd27 100644
--- a/metadata/md5-cache/gnome-base/libgnomeprintui-2.18.6-r1
+++ b/metadata/md5-cache/gnome-base/libgnomeprintui-2.18.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=x11-libs/gtk+-2.6:2[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(-)?] >=gnome-base/libgnomeprint-2.12.1[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(-)?] >=gnome-base/libgnomecanvas-1.117[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(-)?] >=x11-themes/gnome-icon-theme-1.1.92
 SLOT=2.2
 SRC_URI=mirror://gnome/sources/libgnomeprintui/2.18/libgnomeprintui-2.18.6.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=99e8778b363bb8a3d1ab228c5a474ad8
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.40.6 b/metadata/md5-cache/gnome-base/librsvg-2.40.6
index 48129c679b66..cab5eb53ee54 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.40.6
+++ b/metadata/md5-cache/gnome-base/librsvg-2.40.6
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=vala? ( introspection )
 SLOT=2
 SRC_URI=mirror://gnome/sources/librsvg/2.40/librsvg-2.40.6.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=89ddc27e271ca92abbd4e795eccffa79
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.40.8 b/metadata/md5-cache/gnome-base/librsvg-2.40.8
index 15646c94a802..84749664b7ac 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.40.8
+++ b/metadata/md5-cache/gnome-base/librsvg-2.40.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=vala? ( introspection )
 SLOT=2
 SRC_URI=mirror://gnome/sources/librsvg/2.40/librsvg-2.40.8.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0f7fbdc1beb1554c48eed4542685ec1f
diff --git a/metadata/md5-cache/gnome-base/librsvg-2.40.9 b/metadata/md5-cache/gnome-base/librsvg-2.40.9
index c3cc7e568a80..795aa0366ffb 100644
--- a/metadata/md5-cache/gnome-base/librsvg-2.40.9
+++ b/metadata/md5-cache/gnome-base/librsvg-2.40.9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=vala? ( introspection )
 SLOT=2
 SRC_URI=mirror://gnome/sources/librsvg/2.40/librsvg-2.40.9.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=80f3cc9a467963015c613da3b275cbd3
diff --git a/metadata/md5-cache/gnome-extra/activity-log-manager-0.9.7 b/metadata/md5-cache/gnome-extra/activity-log-manager-0.9.7
index fb2d091d6966..c149bcd7b235 100644
--- a/metadata/md5-cache/gnome-extra/activity-log-manager-0.9.7
+++ b/metadata/md5-cache/gnome-extra/activity-log-manager-0.9.7
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-libs/libgee:0 dev-libs/glib:2 gnome-extra/zeitgeist x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango || ( dev-lang/vala:0.28 dev-lang/vala:0.26 dev-lang/vala:0.24 dev-lang/vala:0.22 dev-lang/vala:0.20 ) virtual/pkgconfig dev-util/intltool sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=dev-libs/libgee:0 dev-libs/glib:2 gnome-extra/zeitgeist x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango || ( dev-lang/vala:0.26 ) virtual/pkgconfig dev-util/intltool sys-devel/gettext !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=GUI which lets you easily control what gets logged by Zeitgeist
 EAPI=5
 HOMEPAGE=https://launchpad.net/activity-log-manager/
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/libgee:0 dev-libs/glib:2 gnome-extra/zeitgeist x11-libs/cairo x
 SLOT=0
 SRC_URI=http://launchpad.net/history-manager/0.9/0.9.7/+download/activity-log-manager-0.9.7.tar.xz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=01f0e802452637b2c86fec55e27cd9d3
+_md5_=7a982840cdd17feee545b956499c0323
diff --git a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.15 b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.15
index 56e3b71d29c6..f71c77c18a2b 100644
--- a/metadata/md5-cache/gnome-extra/zeitgeist-0.9.15
+++ b/metadata/md5-cache/gnome-extra/zeitgeist-0.9.15
@@ -4,11 +4,11 @@ DESCRIPTION=Service to log activities and present to other apps
 EAPI=5
 HOMEPAGE=http://launchpad.net/zeitgeist/
 IUSE=+datahub downloads-monitor extensions +fts icu introspection nls plugins sql-debug telepathy python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2+ LGPL-3+ GPL-2+
 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(-)] !gnome-extra/zeitgeist-datahub dev-libs/json-glib dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rdflib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/raptor:2 >=dev-libs/glib-2.26.0:2 >=dev-db/sqlite-3.7.11:3 sys-apps/dbus datahub? ( x11-libs/gtk+:3 ) extensions? ( gnome-extra/zeitgeist-extensions ) fts? ( dev-libs/xapian[inmemory] ) icu? ( dev-libs/dee[icu?,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) introspection? ( dev-libs/gobject-introspection ) plugins? ( gnome-extra/zeitgeist-datasources ) telepathy? ( net-libs/telepathy-glib )
 REQUIRED_USE=|| ( python_targets_python2_7 ) downloads-monitor? ( datahub )
 SLOT=0
 SRC_URI=http://launchpad.net/zeitgeist/0.9/0.9.15/+download/zeitgeist-0.9.15.tar.xz http://dev.gentoo.org/~eva/distfiles/zeitgeist/zeitgeist-0.9.15.tar.xz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=b88120974e0de5fcc6bf853741051126
+_md5_=8089763300cfa28baf09b46ef03873fa
diff --git a/metadata/md5-cache/gnome-extra/zenity-3.16.2 b/metadata/md5-cache/gnome-extra/zenity-3.16.3
similarity index 74%
rename from metadata/md5-cache/gnome-extra/zenity-3.16.2
rename to metadata/md5-cache/gnome-extra/zenity-3.16.3
index 1c7105390101..26481c4f5abb 100644
--- a/metadata/md5-cache/gnome-extra/zenity-3.16.2
+++ b/metadata/md5-cache/gnome-extra/zenity-3.16.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.8:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/libX11 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-1.4.0:3 ) >=sys-devel/gettext-0.19.4 virtual/pkgconfig test? ( app-text/yelp-tools ) app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.8:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/libX11 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-2.8.1:4 ) dev-util/itstool >=sys-devel/gettext-0.19.4 virtual/pkgconfig test? ( app-text/yelp-tools ) app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Tool to display dialogs from the commandline and shell scripts
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Projects/Zenity
 IUSE=libnotify test +webkit debug
 KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.8:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/libX11 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-1.4.0:3 )
+RDEPEND=>=dev-libs/glib-2.8:2 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3:3 x11-libs/libX11 x11-libs/pango libnotify? ( >=x11-libs/libnotify-0.6.1:= ) webkit? ( >=net-libs/webkit-gtk-2.8.1:4 )
 SLOT=0
-SRC_URI=mirror://gnome/sources/zenity/3.16/zenity-3.16.2.tar.xz
+SRC_URI=mirror://gnome/sources/zenity/3.16/zenity-3.16.3.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a7b43931b3a3619665f3928aa1947f82
+_md5_=a524416930e65f63d18d24555c2bbcfc
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.10.0 b/metadata/md5-cache/kde-frameworks/attica-5.10.0
deleted file mode 100644
index 76af4a80d8b9..000000000000
--- a/metadata/md5-cache/kde-frameworks/attica-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtnetwork:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing access to Open Collaboration Services
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-qt/qtnetwork:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/attica-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f2fd2cfbd54793d2179096e047cfa60b
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.11.0 b/metadata/md5-cache/kde-frameworks/attica-5.11.0
index 8c79ba7fd3dd..61b5d5136c47 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtnetwork:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/attica-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=914fd51aa3905624e21068745d5e46c8
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.11.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.11.0
index 1e84c9cffa4b..2951efa97f07 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtnetwork:5 !kde-plasma/bluez-qt >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/bluez-qt-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=e5789ae6abb60eaca59f41a64d12ce93
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.10.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.10.0
deleted file mode 100644
index c0b8c3ad659c..000000000000
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.10.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=dev-util/cmake-2.8.12 doc? ( || ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python:3.4 >=dev-lang/python-3.3.2-r2:3.3 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( dev-lang/python:3.4 dev-python/sphinx[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-3.3.2-r2:3.3 dev-python/sphinx[python_targets_python3_3(-),python_single_target_python3_3(+)] ) ) ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Extra modules and scripts for CMake
-EAPI=5
-HOMEPAGE=https://projects.kde.org/projects/kdesupport/extra-cmake-modules
-IUSE=doc doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/extra-cmake-modules-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4d75728e12a98026829407b5fab6bec1
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.11.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.11.0
index 4d01cf3ac29e..fe803f51db6c 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.11.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=BSD
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/extra-cmake-modules-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=a8fa0b2086480b4a4389122a0395a4c6
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.10.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.10.0
deleted file mode 100644
index 9027256597a7..000000000000
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-plasma/oxygen-fonts-5.3.0 >=kde-frameworks/kcompletion-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kjobwidgets-5.10 >=kde-frameworks/knotifications-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kxmlgui-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/libXcursor ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for integrating Qt applications with KDE workspaces
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=X test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-plasma/oxygen-fonts-5.3.0 >=kde-frameworks/kcompletion-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kjobwidgets-5.10 >=kde-frameworks/knotifications-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kxmlgui-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/libXcursor ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-RESTRICT=test
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/frameworkintegration-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d4e29610b8653df91fb24549c0083194
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.11.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.11.0
index 59a0c93192bc..b937385c1576 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.11.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-plasma/oxygen-fonts-5.3.0 >=kde-frameworks/kcompletion-5.11 >=kde-frameworks/kconfig-5.11 >=kde-frameworks/kconfigwidgets-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kiconthemes-5.11 >=kde-frameworks/kio-5.11 >=kde-frameworks/kjobwidgets-5.11 >=kde-frameworks/knotifications-5.11 >=kde-frameworks/kwidgetsaddons-5.11 >=kde-frameworks/kxmlgui-5.11 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/libXcursor ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11 doc? ( >=kde-frameworks/kapidox-5.11 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-plasma/oxygen-fonts-5.3.1 >=kde-frameworks/kcompletion-5.11 >=kde-frameworks/kconfig-5.11 >=kde-frameworks/kconfigwidgets-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kiconthemes-5.11 >=kde-frameworks/kio-5.11 >=kde-frameworks/kjobwidgets-5.11 >=kde-frameworks/knotifications-5.11 >=kde-frameworks/kwidgetsaddons-5.11 >=kde-frameworks/kxmlgui-5.11 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/libXcursor ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11 doc? ( >=kde-frameworks/kapidox-5.11 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Framework for integrating Qt applications with KDE workspaces
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=X test doc debug test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-plasma/oxygen-fonts-5.3.0 >=kde-frameworks/kcompletion-5.11 >=kde-frameworks/kconfig-5.11 >=kde-frameworks/kconfigwidgets-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kiconthemes-5.11 >=kde-frameworks/kio-5.11 >=kde-frameworks/kjobwidgets-5.11 >=kde-frameworks/knotifications-5.11 >=kde-frameworks/kwidgetsaddons-5.11 >=kde-frameworks/kxmlgui-5.11 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/libXcursor ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-plasma/oxygen-fonts-5.3.1 >=kde-frameworks/kcompletion-5.11 >=kde-frameworks/kconfig-5.11 >=kde-frameworks/kconfigwidgets-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kiconthemes-5.11 >=kde-frameworks/kio-5.11 >=kde-frameworks/kjobwidgets-5.11 >=kde-frameworks/knotifications-5.11 >=kde-frameworks/kwidgetsaddons-5.11 >=kde-frameworks/kxmlgui-5.11 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/libXcursor ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/frameworkintegration-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=082435a1682d4e6629b71b1e7ec44589
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.10.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.10.0
deleted file mode 100644
index 000bff4be792..000000000000
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kdbusaddons-5.10 >=kde-frameworks/kdeclarative-5.10 >=kde-frameworks/kglobalaccel-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwindowsystem-5.10 >=kde-frameworks/kxmlgui-5.10 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !kde-base/kactivities:4[-minimal(-)] || ( >=dev-libs/boost-1.54 <dev-libs/boost-1.53 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for working with KDE activities
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcmutils-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kdbusaddons-5.10 >=kde-frameworks/kdeclarative-5.10 >=kde-frameworks/kglobalaccel-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwindowsystem-5.10 >=kde-frameworks/kxmlgui-5.10 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !kde-base/kactivities:4[-minimal(-)] >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kactivities-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b37a40a41d5090aeee3524db4294a2c9
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.11.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.11.0
index 657fb9214c48..7722d1b364f5 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcmutils-5.11 >=kde-frameworks/kconfig-5.11 >=kde-frameworks/kconfigwidgets-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/kdbusaddons-5.11 >=kde-frameworks/kdeclarative-5.11 >=kde-frameworks/kglobalaccel-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kio-5.11 >=kde-frameworks/kservice-5.11 >=kde-frameworks/kwindowsystem-5.11 >=kde-frameworks/kxmlgui-5.11 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !kde-base/kactivities:4[-minimal(-)] >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kactivities-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=9a023abc436b4a6332bda8bdb62d5bb0
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.10.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.10.0
deleted file mode 100644
index 355c1f92753d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils 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=Framework for building KDE API documentation in a standard format and style
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD-2
-RDEPEND=app-doc/doxygen dev-python/jinja[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/pyyaml[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(-)] media-gfx/graphviz[python] >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) 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=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kapidox-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=09246a7400d3db8d2e1e9c17b8b8ba53
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.11.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.11.0
index 35f972f1acc6..a286d4cb040c 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.11.0
@@ -10,5 +10,5 @@ RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,python_tar
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kapidox-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=917db0598d5b6415534c38b911bd99b9
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.10.0 b/metadata/md5-cache/kde-frameworks/karchive-5.10.0
deleted file mode 100644
index b79f8df1784d..000000000000
--- a/metadata/md5-cache/kde-frameworks/karchive-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for easy reading, creation, and manipulation of various archive formats
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=+bzip2 +lzma doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/karchive-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=86ff23cfa07cb16ac11db6a34e30b0d6
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.11.0 b/metadata/md5-cache/kde-frameworks/karchive-5.11.0
index d2af6dc7c1c1..5d8aa32aa797 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.11.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/karchive-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=9b16d1c66c0e634d04f7c8dafada959e
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.10.0 b/metadata/md5-cache/kde-frameworks/kauth-5.10.0
deleted file mode 100644
index 0a50df748602..000000000000
--- a/metadata/md5-cache/kde-frameworks/kauth-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 policykit? ( sys-auth/polkit-qt[qt5] ) nls? ( dev-qt/linguist-tools:5 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to let applications perform actions as a privileged user
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=nls +policykit test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 policykit? ( sys-auth/polkit-qt[qt5] ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kauth-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a25f8a157bd756dfac74209a553ff43b
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.11.0 b/metadata/md5-cache/kde-frameworks/kauth-5.11.0
index 35cc72598c63..d5a5178c29a8 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.11 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 policykit? ( sys-auth/polkit-qt[qt5] ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kauth-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=686d4e9c3181445029c1642d18d6c320
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.10.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.10.0
deleted file mode 100644
index 8c12cf0c2c8d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kxmlgui-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kconfigwidgets-5.10 nls? ( dev-qt/linguist-tools:5 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for managing bookmarks stored in XBEL format
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=nls test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kxmlgui-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kbookmarks-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f4732270082f827b54b00250d466d9d4
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.11.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.11.0
index 44122a4e4d11..4d3bfdb8122c 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.11 >=kde-frameworks/kconfig-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/kiconthemes-5.11 >=kde-frameworks/kwidgetsaddons-5.11 >=kde-frameworks/kxmlgui-5.11 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kbookmarks-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=b424e5f49c2c4b8126527f88e511706c
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.10.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.10.0
deleted file mode 100644
index 7ccb304501be..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kdeclarative-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kitemviews-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kxmlgui-5.10 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to work with KDE System Settings modules
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=kde-frameworks/kauth-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kdeclarative-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kitemviews-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kxmlgui-5.10 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kcmutils-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f39db608f1d4fbaa3515ca7d1e1193a3
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.11.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.11.0
index f45d9d32afb4..d69b50ba7a6b 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kauth-5.11 >=kde-frameworks/kconfig-5.11 >=kde-frameworks/kconfigwidgets-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/kdeclarative-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kiconthemes-5.11 >=kde-frameworks/kitemviews-5.11 >=kde-frameworks/kservice-5.11 >=kde-frameworks/kwidgetsaddons-5.11 >=kde-frameworks/kxmlgui-5.11 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kcmutils-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=9306cbe572b5eb90e370578aaf173d1f
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.10.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.10.0
deleted file mode 100644
index 11b5c3051739..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=nls? ( dev-qt/linguist-tools:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for manipulating strings using various encodings
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=nls doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kcodecs-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=246f512e0628ccf60febad0eaa6e5be7
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.11.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.11.0
index a6e7f5a3da6c..463d7b496937 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.11.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kcodecs-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=330e908110704ce1ef2b9fe233ea23a5
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.10.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.10.0
deleted file mode 100644
index 531f96bef526..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kwidgetsaddons-5.10 dev-qt/qtgui:5 dev-qt/qtwidgets:5 nls? ( dev-qt/linguist-tools:5 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for common completion tasks such as filename or URL completion
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=nls test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kwidgetsaddons-5.10 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kcompletion-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=08205097ee1685752ee9464344db19fb
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.11.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.11.0
index bb5b8f0693ea..ad8ad342e1c7 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.11.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.11 >=kde-frameworks/kwidgetsaddons-5.11 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kcompletion-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=ce9c9fd4552d8f47713537ffc117076b
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.10.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.10.0
deleted file mode 100644
index 551550576564..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtgui:5 dev-qt/qtxml:5 nls? ( dev-qt/linguist-tools:5 ) test? ( dev-qt/qtconcurrent:5 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for reading and writing configuration
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=nls test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=dev-qt/qtgui:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kconfig-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=da28521cfdd67f5131efbcd817cb1f65
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.11.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.11.0
index 8743dd45f1c7..141f0833d647 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kconfig-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=5f6e7d0d41282028a2525b415a16b61c
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.10.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.10.0
deleted file mode 100644
index 27d385df4a3d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.10 >=kde-frameworks/kcodecs-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kguiaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kwidgetsaddons-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !<kde-frameworks/kdelibs4support-5.3.0:5 >=kde-frameworks/kdoctools-5.10 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing an assortment of configuration-related widgets
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.10 >=kde-frameworks/kcodecs-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kguiaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kwidgetsaddons-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !<kde-frameworks/kdelibs4support-5.3.0:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kconfigwidgets-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=108d2035c85da225fc480cde41ab0b7a
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.11.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.11.0
index 4258399a948b..a7720ed827a7 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.11 >=kde-frameworks/kcodecs-5.11 >=kde-frameworks/kconfig-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/kguiaddons-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kwidgetsaddons-5.11 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !<kde-frameworks/kdelibs4support-5.3.0:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kconfigwidgets-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=3faa62add94f115fa7337d44a1c1b2f0
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.10.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.10.0
deleted file mode 100644
index acbfd502e070..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtcore:5[icu] fam? ( virtual/fam ) !<kde-frameworks/kservice-5.2.0:5 x11-misc/shared-mime-info nls? ( dev-qt/linguist-tools:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=fam nls doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=dev-qt/qtcore:5[icu] fam? ( virtual/fam ) !<kde-frameworks/kservice-5.2.0:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kcoreaddons-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9d87baf31c701d5cda835f886c0b22bc
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.11.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.11.0
index 5f6b325b635a..0ec4a639bd31 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtcore:5[icu] fam? ( virtual/fam ) !<kde-frameworks/kservice-5.2.0:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kcoreaddons-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=8a80c9392d17f2aafe4794040e0501d0
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.10.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.10.0
deleted file mode 100644
index 50026292c721..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kwindowsystem-5.10 dev-qt/qtgui:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) nls? ( dev-qt/linguist-tools:5 ) test? ( dev-qt/qtwidgets:5 ) X? ( x11-proto/xproto ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for intercepting and handling application crashes
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=nls X test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kwindowsystem-5.10 dev-qt/qtgui:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-RESTRICT=test
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kcrash-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6e340b9eddef0191ca683e1da729cc71
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.11.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.11.0
index 9d1c20a43e62..25745b8c9f3a 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.11.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/kwindowsystem-5.11 de
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kcrash-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=cef3737a9ec6de6fc3b48232a4e14020
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.10.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.10.0
deleted file mode 100644
index 57a6523ce43c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtdbus:5 X? ( dev-qt/qtx11extras:5 ) nls? ( dev-qt/linguist-tools:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for registering services and applications according to freedesktop standards
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=nls X doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=dev-qt/qtdbus:5 X? ( dev-qt/qtx11extras:5 ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kdbusaddons-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4bfa46149d9b07bab9c7ba152c6a0cd8
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.11.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.11.0
index c920a1bbf870..8e30759e4135 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtdbus:5 X? ( dev-qt/qtx11extras:5 ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kdbusaddons-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=4e6fdac94c88976e22677ead1868f592
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.10.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.10.0
deleted file mode 100644
index a48ff836e592..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kglobalaccel-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kpackage-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kwindowsystem-5.10 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libepoxy >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing integration of QML and KDE work spaces
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=doc debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kglobalaccel-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kpackage-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kwindowsystem-5.10 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libepoxy >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kdeclarative-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6d6c88092f07e88b1827b1c975ee33fc
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.11.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.11.0
index 0fbd71132a81..ec7e713a23dd 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/kglobalaccel-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kiconthemes-5.11 >=kde-frameworks/kio-5.11 >=kde-frameworks/kpackage-5.11 >=kde-frameworks/kservice-5.11 >=kde-frameworks/kwidgetsaddons-5.11 >=kde-frameworks/kwindowsystem-5.11 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/libepoxy >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kdeclarative-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=b3df178aa78b91fd96323c95703844ad
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.10.0 b/metadata/md5-cache/kde-frameworks/kded-5.10.0
deleted file mode 100644
index 107d4e813de3..000000000000
--- a/metadata/md5-cache/kde-frameworks/kded-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kcrash-5.10 >=kde-frameworks/kdbusaddons-5.10 >=kde-frameworks/kinit-5.10 >=kde-frameworks/kservice-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kdoctools-5.10 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Central daemon of KDE workspaces
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=doc debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kcrash-5.10 >=kde-frameworks/kdbusaddons-5.10 >=kde-frameworks/kinit-5.10 >=kde-frameworks/kservice-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kded-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f41feabbf56dd6a2de59d8764160a0b4
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.11.0 b/metadata/md5-cache/kde-frameworks/kded-5.11.0
index ded0a78fef49..3100849b504a 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kded-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/kcrash-5.11 >=kde-frameworks/kdbusaddons-5.11 >=kde-frameworks/kinit-5.11 >=kde-frameworks/kservice-5.11 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kded-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=550b9a172e87969c8f1f7c571c6a612a
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.10.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.10.0
deleted file mode 100644
index 78519578304b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.10 >=kde-frameworks/kcodecs-5.10 >=kde-frameworks/kcompletion-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kcrash-5.10 >=kde-frameworks/kdbusaddons-5.10 >=kde-frameworks/kdesignerplugin-5.10 >=kde-frameworks/kglobalaccel-5.10 >=kde-frameworks/kguiaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kitemviews-5.10 >=kde-frameworks/kjobwidgets-5.10 >=kde-frameworks/knotifications-5.10 >=kde-frameworks/kparts-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/ktextwidgets-5.10 >=kde-frameworks/kunitconversion-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kwindowsystem-5.10 >=kde-frameworks/kxmlgui-5.10 >=kde-frameworks/solid-5.10 app-text/docbook-xml-dtd:4.2 dev-libs/openssl:0 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 virtual/libintl X? ( dev-qt/qtx11extras:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.10 dev-lang/perl dev-perl/URI dev-qt/designer:5 test? ( dev-qt/qtconcurrent:5 ) X? ( x11-proto/xproto ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework easing the development transition from KDE 4 to KF 5
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=X test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.10 >=kde-frameworks/kcodecs-5.10 >=kde-frameworks/kcompletion-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kcrash-5.10 >=kde-frameworks/kdbusaddons-5.10 >=kde-frameworks/kdesignerplugin-5.10 >=kde-frameworks/kglobalaccel-5.10 >=kde-frameworks/kguiaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kitemviews-5.10 >=kde-frameworks/kjobwidgets-5.10 >=kde-frameworks/knotifications-5.10 >=kde-frameworks/kparts-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/ktextwidgets-5.10 >=kde-frameworks/kunitconversion-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kwindowsystem-5.10 >=kde-frameworks/kxmlgui-5.10 >=kde-frameworks/solid-5.10 app-text/docbook-xml-dtd:4.2 dev-libs/openssl:0 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 virtual/libintl X? ( dev-qt/qtx11extras:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.10 >=kde-frameworks/kemoticons-5.10 >=kde-frameworks/kinit-5.10 >=kde-frameworks/kitemmodels-5.10 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/portingAids/kdelibs4support-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b4a1c4126e27516024c4b633f3186b16
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.11.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.11.0
index 7df5c96ad205..8223e9a0beea 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kauth-5.11 >=kde-frameworks/kcodecs-5.11 >=kde-frameworks/kcompletion-5.11 >=kde-frameworks/kconfig-5.11 >=kde-frameworks/kconfigwidgets-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/kcrash-5.11 >=kde-frameworks/kdbusaddons-5.11 >=kde-frameworks/kdesignerplugin-5.11 >=kde-frameworks/kglobalaccel-5.11 >=kde-frameworks/kguiaddons-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kiconthemes-5.11 >=kde-frameworks/kio-5.11 >=kde-frameworks/kitemviews-5.11 >=kde-frameworks/kjobwidgets-5.11 >=kde-frameworks/knotifications-5.11 >=kde-frameworks/kparts-5.11 >=kde-frameworks/kservice-5.11 >=kde-frameworks/ktextwidgets-5.11 >=kde-frameworks/kunitconversion-5.11 >=kde-frameworks/kwidgetsaddons-5.11 >=kde-frameworks/kwindowsystem-5.11 >=kde-frameworks/kxmlgui-5.11 >=kde-frameworks/solid-5.11 app-text/docbook-xml-dtd:4.2 dev-libs/openssl:0 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwidgets:5 virtual/libintl X? ( dev-qt/qtx11extras:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.11 >=kde-frameworks/kemoticons-5.11 >=kde-frameworks/kinit-5.11 >=kde-frameworks/kitemmodels-5.11 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/portingAids/kdelibs4support-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=0fe7ff21d1878df0ca723c7b808198aa
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.10.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.10.0
deleted file mode 100644
index cf7a418618cf..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 designer? ( dev-qt/designer:5 >=kde-frameworks/kcompletion-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kitemviews-5.10 >=kde-frameworks/kplotting-5.10 >=kde-frameworks/ktextwidgets-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kxmlgui-5.10 >=kde-frameworks/sonnet-5.10 ) webkit? ( dev-qt/designer:5 dev-qt/qtgui:5 >=kde-frameworks/kdewebkit-5.10 ) >=kde-frameworks/kdoctools-5.10 nls? ( dev-qt/linguist-tools:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing plugins to use KDE frameworks widgets in QtDesigner
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=designer nls webkit doc debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 designer? ( dev-qt/designer:5 >=kde-frameworks/kcompletion-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kitemviews-5.10 >=kde-frameworks/kplotting-5.10 >=kde-frameworks/ktextwidgets-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kxmlgui-5.10 >=kde-frameworks/sonnet-5.10 ) webkit? ( dev-qt/designer:5 dev-qt/qtgui:5 >=kde-frameworks/kdewebkit-5.10 ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kdesignerplugin-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=cc1ca4f216fcc3ed7a310d76e7ce24ed
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.11.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.11.0
index be5d3bddfa0c..b88b42b840b1 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.11 >=kde-frameworks/kcoreaddons-5.11 designer? ( dev-qt/designer:5 >=kde-frameworks/kcompletion-5.11 >=kde-frameworks/kconfigwidgets-5.11 >=kde-frameworks/kiconthemes-5.11 >=kde-frameworks/kio-5.11 >=kde-frameworks/kitemviews-5.11 >=kde-frameworks/kplotting-5.11 >=kde-frameworks/ktextwidgets-5.11 >=kde-frameworks/kwidgetsaddons-5.11 >=kde-frameworks/kxmlgui-5.11 >=kde-frameworks/sonnet-5.11 ) webkit? ( dev-qt/designer:5 dev-qt/qtgui:5 >=kde-frameworks/kdewebkit-5.11 ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kdesignerplugin-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=8ee7b70020dc3818acaaa5a97bda525c
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.10.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.10.0
deleted file mode 100644
index 2b5c92c93a55..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kpty-5.10 >=kde-frameworks/kservice-5.10 X? ( x11-libs/libX11 ) X? ( x11-proto/xproto ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to handle super user actions
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=X doc debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kpty-5.10 >=kde-frameworks/kservice-5.10 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kdesu-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7b0ca21fef71b4fedb9c04948dac15c1
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.11.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.11.0
index def2eaf2d1da..be0e241e9629 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kpty-5.11 >=kde-frameworks/kservice-5.11 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kdesu-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=456d706a8d2cbddb17b5e90a575152ec
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.10.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.10.0
deleted file mode 100644
index db1e44c9aecb..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kjobwidgets-5.10 >=kde-frameworks/kparts-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwallet-5.10 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing KDE integration of QtWebKit
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=doc debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kjobwidgets-5.10 >=kde-frameworks/kparts-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwallet-5.10 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kdewebkit-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4a06529a428e379e93f053d18076cd05
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.11.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.11.0
index ba80f15b5d69..fdf2cecf7c58 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/kio-5.11 >=kde-frameworks/kjobwidgets-5.11 >=kde-frameworks/kparts-5.11 >=kde-frameworks/kservice-5.11 >=kde-frameworks/kwallet-5.11 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kdewebkit-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=5cfb7ac875326db7e2b5a983fcff8a72
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.10.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.10.0
deleted file mode 100644
index 4598364aa163..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtnetwork:5 zeroconf? ( dev-qt/qtdbus:5 net-dns/avahi[mdnsresponder-compat] ) nls? ( dev-qt/linguist-tools:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for network service discovery using Zeroconf
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=nls zeroconf doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=dev-qt/qtnetwork:5 zeroconf? ( dev-qt/qtdbus:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kdnssd-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=335d500ae1404e4bf1ba5356fc8956b8
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.11.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.11.0
index 29c851fbb747..191a1b4132e9 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtnetwork:5 zeroconf? ( dev-qt/qtdbus:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kdnssd-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=1b5ff2cddf1805974bd0e0c994483ff8
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.10.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.10.0
deleted file mode 100644
index bd21a2c14b22..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.10 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxml2:2 dev-libs/libxslt dev-lang/perl dev-perl/URI >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing tools to generate documentation in various formats from DocBook files
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=kde-frameworks/karchive-5.10 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kdoctools-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8613b39e55db7f9350ab6c95f9ea493e
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.11.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.11.0
index e7c5f3e7b99e..80b9bbd7ae94 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.11.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/karchive-5.11 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kdoctools-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=efb3334ee2314f444f4c879d9c1aafa3
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.10.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.10.0
deleted file mode 100644
index 1099c2b916fa..000000000000
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kservice-5.10 dev-qt/qtgui:5 dev-qt/qtxml:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for converting text emoticons to graphical representations
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kservice-5.10 dev-qt/qtgui:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-RESTRICT=test
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kemoticons-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6f61830cff99b1a81d21fccc5b5a88b0
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.11.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.11.0
index c2d82f4ce5d9..68ef40593578 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.11.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.11 >=kde-frameworks/kconfig-5.11 >=kde-frame
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kemoticons-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=d33753e475ed7cd5472af7bd1c59a6b9
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.10.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.10.0
deleted file mode 100644
index 8726e0c5df59..000000000000
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kcrash-5.10 >=kde-frameworks/kdbusaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kwindowsystem-5.10[X] dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms !<kde-plasma/plasma-workspace-5.2.0-r2 nls? ( dev-qt/linguist-tools:5 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to handle global shortcuts
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=nls test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kcrash-5.10 >=kde-frameworks/kdbusaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kwindowsystem-5.10[X] dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms !<kde-plasma/plasma-workspace-5.2.0-r2 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kglobalaccel-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8a1e2ab62426f883fb9b210649db18da
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.11.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.11.0
index 6296642c6246..0a7ee963db71 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/kcrash-5.11 >=kde-frameworks/kdbusaddons-5.11 >=kde-frameworks/kwindowsystem-5.11[X] dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb x11-libs/xcb-util-keysyms !<kde-plasma/plasma-workspace-5.2.0-r2 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kglobalaccel-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=948cf408223fb0b93eb10a74509d717e
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.10.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.10.0
deleted file mode 100644
index b96d8992ad69..000000000000
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libxcb x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing assorted high-level user interface components
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=test doc debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libX11 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kguiaddons-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b05dba7a14b68cbf8188351170ff4f0f
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.11.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.11.0
index eb7a517b6ba1..f153a39f54f7 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libX11 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kguiaddons-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=c39088da7f73c27ac48f3ee7a8b22ec9
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.10.0 b/metadata/md5-cache/kde-frameworks/khtml-5.10.0
deleted file mode 100644
index 7d963df3e004..000000000000
--- a/metadata/md5-cache/kde-frameworks/khtml-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.10 >=kde-frameworks/kcodecs-5.10 >=kde-frameworks/kcompletion-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kglobalaccel-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kjobwidgets-5.10 >=kde-frameworks/kjs-5.10 >=kde-frameworks/knotifications-5.10 >=kde-frameworks/kparts-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/ktextwidgets-5.10 >=kde-frameworks/kwallet-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kwindowsystem-5.10 >=kde-frameworks/kxmlgui-5.10 >=kde-frameworks/sonnet-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/giflib media-libs/libpng:0= media-libs/phonon[qt5] sys-libs/zlib virtual/jpeg:0 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) dev-lang/perl dev-libs/openssl test? ( dev-qt/qtx11extras:5 ) X? ( x11-proto/xproto ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KHTML web rendering engine
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=X test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.10 >=kde-frameworks/kcodecs-5.10 >=kde-frameworks/kcompletion-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kglobalaccel-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kjobwidgets-5.10 >=kde-frameworks/kjs-5.10 >=kde-frameworks/knotifications-5.10 >=kde-frameworks/kparts-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/ktextwidgets-5.10 >=kde-frameworks/kwallet-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kwindowsystem-5.10 >=kde-frameworks/kxmlgui-5.10 >=kde-frameworks/sonnet-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/giflib media-libs/libpng:0= media-libs/phonon[qt5] sys-libs/zlib virtual/jpeg:0 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/portingAids/khtml-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d0427e33eacf57ddb6572b3471dc20bb
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.11.0 b/metadata/md5-cache/kde-frameworks/khtml-5.11.0
index 2682c83de830..026108af063f 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.11 >=kde-frameworks/kcodecs-5.11 >=kde-frameworks/kcompletion-5.11 >=kde-frameworks/kconfig-5.11 >=kde-frameworks/kconfigwidgets-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/kglobalaccel-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kiconthemes-5.11 >=kde-frameworks/kio-5.11 >=kde-frameworks/kjobwidgets-5.11 >=kde-frameworks/kjs-5.11 >=kde-frameworks/knotifications-5.11 >=kde-frameworks/kparts-5.11 >=kde-frameworks/kservice-5.11 >=kde-frameworks/ktextwidgets-5.11 >=kde-frameworks/kwallet-5.11 >=kde-frameworks/kwidgetsaddons-5.11 >=kde-frameworks/kwindowsystem-5.11 >=kde-frameworks/kxmlgui-5.11 >=kde-frameworks/sonnet-5.11 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/giflib media-libs/libpng:0= media-libs/phonon[qt5] sys-libs/zlib virtual/jpeg:0 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/portingAids/khtml-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=5804a1bfcd532db2fdd08618ed98fb7b
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.10.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.10.0
deleted file mode 100644
index 3d1d7549b67c..000000000000
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtscript:5 virtual/libintl test? ( dev-qt/qtconcurrent:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework based on Gettext for internationalizing user interface text
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=dev-qt/qtscript:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/ki18n-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=30114f46ae0515d5c19b71d6308d9fab
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.11.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.11.0
index 94291c0ee8f6..0c043fe7e510 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtscript:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/ki18n-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=7243c0f7be0d90adbbc2867726cdee59
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.10.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.10.0
deleted file mode 100644
index 1392abd2dc82..000000000000
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kitemviews-5.10 >=kde-frameworks/kwidgetsaddons-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for icon theming and configuration
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kitemviews-5.10 >=kde-frameworks/kwidgetsaddons-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kiconthemes-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=48116212308f3252053e27fbe0cd22c9
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.11.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.11.0
index 96f07138205a..76dea60a8903 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.11 >=kde-frameworks/kconfigwidgets-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kitemviews-5.11 >=kde-frameworks/kwidgetsaddons-5.11 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kiconthemes-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=292f79f5ff86c71e86c5f7ae2189b8b6
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.10.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.10.0
deleted file mode 100644
index 62de2cf7dbb5..000000000000
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtdbus:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libxcb >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for detection and notification of device idle time
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=doc debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=dev-qt/qtdbus:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libxcb >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kidletime-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0a5be465f08c9f98c58856629832f494
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.11.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.11.0
index a160de8c2843..ee40f6c27580 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libxcb >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kidletime-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=6ddd5ddec77a60b4c5968b54eaa04092
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.10.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.10.0
deleted file mode 100644
index 1083bd81856d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtgui:5 eps? ( dev-qt/qtprintsupport:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing additional format plugins for Qt's image I/O system
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=eps openexr test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=dev-qt/qtgui:5 eps? ( dev-qt/qtprintsupport:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kimageformats-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=5200ac569975fa74aec913c1b432f5c5
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.11.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.11.0
index 3a81e54029e6..979032d45053 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtgui:5 eps? ( dev-qt/qtprintsupport:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kimageformats-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=06160e67cfed1280974b173e68ec9ad5
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.10.0 b/metadata/md5-cache/kde-frameworks/kinit-5.10.0
deleted file mode 100644
index 6924e656751d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kinit-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kcrash-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwindowsystem-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 x11-libs/libX11 caps? ( sys-libs/libcap ) x11-proto/xproto >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=+caps doc debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kcrash-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwindowsystem-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 x11-libs/libX11 caps? ( sys-libs/libcap ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kinit-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=485848fb3250fa8f6e7edbe240c975a7
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.11.0 b/metadata/md5-cache/kde-frameworks/kinit-5.11.0
index b8e64bb3a922..a9760271b5aa 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/kcrash-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kio-5.11 >=kde-frameworks/kservice-5.11 >=kde-frameworks/kwindowsystem-5.11 dev-qt/qtdbus:5 dev-qt/qtgui:5 x11-libs/libX11 caps? ( sys-libs/libcap ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kinit-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=51c7314eab5ac00b6385b39991011fed
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.10.0 b/metadata/md5-cache/kde-frameworks/kio-5.10.0
deleted file mode 100644
index bf8b2ed48f04..000000000000
--- a/metadata/md5-cache/kde-frameworks/kio-5.10.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.10 >=kde-frameworks/kbookmarks-5.10 >=kde-frameworks/kcodecs-5.10 >=kde-frameworks/kcompletion-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kdbusaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kitemviews-5.10 >=kde-frameworks/kjobwidgets-5.10 >=kde-frameworks/knotifications-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/ktextwidgets-5.10 >=kde-frameworks/kwallet-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kwindowsystem-5.10 >=kde-frameworks/kxmlgui-5.10 >=kde-frameworks/solid-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) kerberos? ( virtual/krb5 ) X? ( dev-qt/qtx11extras:5 ) !<kde-base/kio-extras-5.0.95-r1:5 >=kde-frameworks/kdoctools-5.10 dev-qt/qtconcurrent:5 test? ( sys-libs/zlib ) X? ( x11-libs/libX11 x11-libs/libXrender x11-proto/xproto ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing transparent file and data management
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=acl kerberos X test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-PDEPEND=>=kde-frameworks/kded-5.10
-RDEPEND=>=kde-frameworks/karchive-5.10 >=kde-frameworks/kbookmarks-5.10 >=kde-frameworks/kcodecs-5.10 >=kde-frameworks/kcompletion-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kdbusaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kitemviews-5.10 >=kde-frameworks/kjobwidgets-5.10 >=kde-frameworks/knotifications-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/ktextwidgets-5.10 >=kde-frameworks/kwallet-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kwindowsystem-5.10 >=kde-frameworks/kxmlgui-5.10 >=kde-frameworks/solid-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) kerberos? ( virtual/krb5 ) X? ( dev-qt/qtx11extras:5 ) !<kde-base/kio-extras-5.0.95-r1:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-RESTRICT=test
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kio-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=8a760573e3c04e4c19070d159210b7e3
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.11.0 b/metadata/md5-cache/kde-frameworks/kio-5.11.0
index 4e2a01a9ec2d..5f94afa798b8 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kio-5.11.0
@@ -11,5 +11,5 @@ RDEPEND=>=kde-frameworks/karchive-5.11 >=kde-frameworks/kbookmarks-5.11 >=kde-fr
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kio-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=a879efb00bfd35fab0de2594eedfdd6e
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.10.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.10.0
deleted file mode 100644
index cf0e2c4ddcdf..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=test? ( dev-qt/qtwidgets:5 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing data models that help with tasks such as sorting and filtering
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kitemmodels-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=613bd0386d434bff1dad2b12b584bf65
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.11.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.11.0
index 3aba438e0ba9..1d692481943d 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kitemmodels-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=042b6f439db005a28e0766d970531be5
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.10.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.10.0
deleted file mode 100644
index 5762f0bc18e1..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 nls? ( dev-qt/linguist-tools:5 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing additional widgets for item models
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=nls test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kitemviews-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=42d68a742cadd9a2f9d86414e804fdb6
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.11.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.11.0
index c4f7210d1243..7e6dd2ff90e8 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kitemviews-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=a9e1b1b01affc412b20aed48b5892f18
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.10.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.10.0
deleted file mode 100644
index e34b8b2a3c1a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kwidgetsaddons-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) nls? ( dev-qt/linguist-tools:5 ) X? ( x11-libs/libX11 x11-proto/xproto ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=nls X doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kwidgetsaddons-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kjobwidgets-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=75a0d131e654f6ff16b48309e8a6fe8e
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.11.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.11.0
index ccf82c43b291..fc8d29f5e989 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/kwidgetsaddons-5.11 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kjobwidgets-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=70d16d0959058f56244e955994dc286c
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.10.0 b/metadata/md5-cache/kde-frameworks/kjs-5.10.0
deleted file mode 100644
index dac12a31faa5..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjs-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-libs/libpcre >=kde-frameworks/kdoctools-5.10 dev-lang/perl >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=ECMAScipt compatible parser and engine
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2 LGPL-2+
-RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/portingAids/kjs-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7381516fd5964442793591906b9dc43d
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.11.0 b/metadata/md5-cache/kde-frameworks/kjs-5.11.0
index a140bf6dc8c7..1707025c79c0 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.11.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2 LGPL-2+
 RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/portingAids/kjs-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=298629a2489e73db4dea8fa97d003ebc
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.10.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.10.0
deleted file mode 100644
index d9317b990db9..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.10 >=kde-frameworks/kjs-5.10 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kdoctools-5.10 dev-qt/designer:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework binding JavaScript objects to QObjects
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=doc debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.10 >=kde-frameworks/kjs-5.10 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/portingAids/kjsembed-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=de8d35172d66a7f34a26366c05bc2d9c
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.11.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.11.0
index bac051662407..aba6c8b3d25c 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.11 >=kde-frameworks/kjs-5.11 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/portingAids/kjsembed-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=4b48999354de3797f6715584f7bb0991
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.10.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.10.0
deleted file mode 100644
index c9db1062a012..000000000000
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kparts-5.10 >=kde-frameworks/kxmlgui-5.10 dev-qt/qtdbus:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing a common interface for KParts that can play media files
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=kde-frameworks/kparts-5.10 >=kde-frameworks/kxmlgui-5.10 dev-qt/qtdbus:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/portingAids/kmediaplayer-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d91c56709dc5494d88cd4b3eadf90116
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.11.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.11.0
index 6351f207c6e9..9df42974aa89 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.11.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/kparts-5.11 >=kde-frameworks/kxmlgui-5.11 dev-qt/qtdbus:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/portingAids/kmediaplayer-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=97e80d4f846a847a37a3c8e592be7b0f
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.10.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.10.0
deleted file mode 100644
index ca2e29a2abb7..000000000000
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/attica-5.10 >=kde-frameworks/karchive-5.10 >=kde-frameworks/kcompletion-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kitemviews-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/ktextwidgets-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kxmlgui-5.10 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for downloading and sharing additional application data
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=doc debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/attica-5.10 >=kde-frameworks/karchive-5.10 >=kde-frameworks/kcompletion-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kitemviews-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/ktextwidgets-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kxmlgui-5.10 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/knewstuff-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3283f3feb68fc75e77403bd86425596c
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.11.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.11.0
index f506b8fdb6e3..80f082ad60a9 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/attica-5.11 >=kde-frameworks/karchive-5.11 >=kde-frameworks/kcompletion-5.11 >=kde-frameworks/kconfig-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kiconthemes-5.11 >=kde-frameworks/kio-5.11 >=kde-frameworks/kitemviews-5.11 >=kde-frameworks/kservice-5.11 >=kde-frameworks/ktextwidgets-5.11 >=kde-frameworks/kwidgetsaddons-5.11 >=kde-frameworks/kxmlgui-5.11 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/knewstuff-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=ca13d267cdb0f2a22c95f0cf14635a72
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.10.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.10.0
deleted file mode 100644
index 987242a3946d..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcodecs-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwindowsystem-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] dbus? ( dev-libs/libdbusmenu-qt[qt5] ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXtst ) nls? ( dev-qt/linguist-tools:5 ) X? ( x11-proto/xproto ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for notifying the user of an event, including feedback and persistant events
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=dbus X nls doc debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwindowsystem-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] dbus? ( dev-libs/libdbusmenu-qt[qt5] ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/knotifications-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4af41b54ce639ae8f04400c2eacfa4e7
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.11.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.11.0
index 0325d949e8d4..8ef12001ab15 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.11 >=kde-frameworks/kconfig-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/kiconthemes-5.11 >=kde-frameworks/kservice-5.11 >=kde-frameworks/kwindowsystem-5.11 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/phonon[qt5] dbus? ( dev-libs/libdbusmenu-qt[qt5] ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/knotifications-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=4740e17c11e4aa9eef02cadbe4a83968
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.10.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.10.0
deleted file mode 100644
index 442455d92a5c..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kio-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 phonon? ( media-libs/phonon[qt5] ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for configuring desktop notifications
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=phonon doc debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kio-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 phonon? ( media-libs/phonon[qt5] ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/knotifyconfig-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a0c26668f83825312dc6e3f11bd2df4d
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.11.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.11.0
index 49438b33b8b1..1d4f17b0a16f 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.11 >=kde-frameworks/kconfig-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kio-5.11 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 phonon? ( media-libs/phonon[qt5] ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/knotifyconfig-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=18435c2c3436d7c12cc3cf2bb591f7a5
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.10.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.10.0
deleted file mode 100644
index b74c9175c15b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kdoctools-5.10 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to install and load packages of non binary content
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kpackage-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=0243710ae0c83111a97cac5c3f065dc8
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.11.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.11.0
index 60d5cf952e14..1f7ea325816f 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.11 >=kde-frameworks/kconfig-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kpackage-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=2aa72e4b7719d1e3a1704aa9713e9e84
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.10.0 b/metadata/md5-cache/kde-frameworks/kparts-5.10.0
deleted file mode 100644
index b07b3c668abd..000000000000
--- a/metadata/md5-cache/kde-frameworks/kparts-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kjobwidgets-5.10 >=kde-frameworks/knotifications-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kxmlgui-5.10 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/ktextwidgets-5.10 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing elaborate user-interface components
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kjobwidgets-5.10 >=kde-frameworks/knotifications-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kxmlgui-5.10 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kparts-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4da93a6593544b88babe4233c074c382
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.11.0 b/metadata/md5-cache/kde-frameworks/kparts-5.11.0
index 67e778eb7ab5..d8618bd6b243 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kiconthemes-5.11 >=kde-frameworks/kio-5.11 >=kde-frameworks/kjobwidgets-5.11 >=kde-frameworks/knotifications-5.11 >=kde-frameworks/kservice-5.11 >=kde-frameworks/kwidgetsaddons-5.11 >=kde-frameworks/kxmlgui-5.11 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kparts-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=f1eb5a48d7b1f4a05978ee2397944592
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.10.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.10.0
deleted file mode 100644
index 7179fe06339f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kitemviews-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwidgetsaddons-5.10 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE contact person abstraction library
-EAPI=5
-HOMEPAGE=https://projects.kde.org/projects/frameworks/kpeople
-IUSE=doc debug test
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kitemviews-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwidgetsaddons-5.10 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !net-libs/kpeople:5 !net-libs/libkpeople[-minimal(-)] >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kpeople-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=78b281440c772d31516824f947a536c8
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.11.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.11.0
index c7010fb05dd5..0819be93d38f 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kitemviews-5.11 >=kde-frameworks/kservice-5.11 >=kde-frameworks/kwidgetsaddons-5.11 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 !net-libs/kpeople:5 !net-libs/libkpeople[-minimal(-)] >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kpeople-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=d5d76a6bfeb97e8e1ed65073e1108f85
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.10.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.10.0
deleted file mode 100644
index a8038d125b28..000000000000
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing easy data-plotting functions
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kplotting-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f724426db469e56a9913a4f7c1864a1b
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.11.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.11.0
index 23db93e50f93..0d603a251e7f 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kplotting-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=3342805174080a7f2aa489ff348c7cb1
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.10.0 b/metadata/md5-cache/kde-frameworks/kpty-5.10.0
deleted file mode 100644
index ee86bf23d2b7..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpty-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 sys-libs/libutempter >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for pseudo terminal devices and running child processes
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 sys-libs/libutempter >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kpty-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=c43c39bd3c07f770efb4275601d6e911
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.11.0 b/metadata/md5-cache/kde-frameworks/kpty-5.11.0
index becf94e9627f..f0526dd480c3 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/ki18n-5.11 sys-libs/libutempter >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kpty-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=bf87c3a307a6034635cf7a83bcde0776
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.10.0 b/metadata/md5-cache/kde-frameworks/kross-5.10.0
deleted file mode 100644
index 095b0b26763b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kross-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kparts-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kxmlgui-5.10 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kdoctools-5.10 dev-qt/designer:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for embedding scripting into applications
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kparts-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kxmlgui-5.10 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/portingAids/kross-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=43d9d2f1ad02cdcdde9515ed98ced0e0
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.11.0 b/metadata/md5-cache/kde-frameworks/kross-5.11.0
index d781e0f8b3a0..2d4fc8b2e1ed 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kiconthemes-5.11 >=kde-frameworks/kio-5.11 >=kde-frameworks/kparts-5.11 >=kde-frameworks/kwidgetsaddons-5.11 >=kde-frameworks/kxmlgui-5.11 dev-qt/qtgui:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/portingAids/kross-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=1e74926bde1972a4b87d0a8a82ea2ea4
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.10.0 b/metadata/md5-cache/kde-frameworks/krunner-5.10.0
deleted file mode 100644
index e64097a92f67..000000000000
--- a/metadata/md5-cache/kde-frameworks/krunner-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/plasma-5.10 >=kde-frameworks/solid-5.10 >=kde-frameworks/threadweaver-5.10 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for providing different actions given a string query
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/plasma-5.10 >=kde-frameworks/solid-5.10 >=kde-frameworks/threadweaver-5.10 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/portingAids/krunner-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=977a2b22de8cdfa828521c8d345ab006
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.11.0 b/metadata/md5-cache/kde-frameworks/krunner-5.11.0
index 6865a50e9afb..4cb1cc1a7aa5 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kio-5.11 >=kde-frameworks/kservice-5.11 >=kde-frameworks/plasma-5.11 >=kde-frameworks/solid-5.11 >=kde-frameworks/threadweaver-5.11 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/portingAids/krunner-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=5de8b1eb51150c81f64ef5cc1811d2f7
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.10.0 b/metadata/md5-cache/kde-frameworks/kservice-5.10.0
deleted file mode 100644
index bc40a3a92298..000000000000
--- a/metadata/md5-cache/kde-frameworks/kservice-5.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kcrash-5.10 >=kde-frameworks/kdbusaddons-5.10 >=kde-frameworks/ki18n-5.10 dev-qt/qtdbus:5 dev-qt/qtxml:5 >=kde-frameworks/kdoctools-5.10 test? ( dev-qt/qtconcurrent:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing advanced features for plugins, such as file type association and locating
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2 LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kcrash-5.10 >=kde-frameworks/kdbusaddons-5.10 >=kde-frameworks/ki18n-5.10 dev-qt/qtdbus:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-RESTRICT=test
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kservice-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=d4ee5c757a9d72b5a1d09f76c4170672
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.11.0 b/metadata/md5-cache/kde-frameworks/kservice-5.11.0
index 9ba14d287787..5a587971ac51 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.11.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-fr
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kservice-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=5df538bf6dd76ae98363617a7ea9bedf
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.10.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.10.0
deleted file mode 100644
index d27d84568f3e..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.10 >=kde-frameworks/kcodecs-5.10 >=kde-frameworks/kcompletion-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kguiaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kitemviews-5.10 >=kde-frameworks/kjobwidgets-5.10 >=kde-frameworks/kparts-5.10 >=kde-frameworks/ktextwidgets-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kxmlgui-5.10 >=kde-frameworks/sonnet-5.10 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 git? ( dev-libs/libgit2 ) dev-qt/qtxmlpatterns:5 test? ( >=kde-frameworks/kservice-5.10 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing a full text editor component
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=git test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.10 >=kde-frameworks/kcodecs-5.10 >=kde-frameworks/kcompletion-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kguiaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/kitemviews-5.10 >=kde-frameworks/kjobwidgets-5.10 >=kde-frameworks/kparts-5.10 >=kde-frameworks/ktextwidgets-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kxmlgui-5.10 >=kde-frameworks/sonnet-5.10 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 git? ( dev-libs/libgit2 ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-RESTRICT=test
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/ktexteditor-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b3833e11750e4f63592950d8396d91ce
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.11.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.11.0
index 1a848e2b58b5..1421fb76e198 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.11.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.11 >=kde-frameworks/kcodecs-5.11 >=kde-frame
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/ktexteditor-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=976f31149f56599c97fa79c1836c844b
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.10.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.10.0
deleted file mode 100644
index a76a5a3df946..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kwindowsystem-5.10 >=kde-frameworks/sonnet-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcompletion-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kwindowsystem-5.10 >=kde-frameworks/sonnet-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/ktextwidgets-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=125c55c616f9f66578ca00bc754a909e
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.11.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.11.0
index 6d737a266942..11ce91d41bfc 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcompletion-5.11 >=kde-frameworks/kconfig-5.11 >=kde-frameworks/kconfigwidgets-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kiconthemes-5.11 >=kde-frameworks/kservice-5.11 >=kde-frameworks/kwidgetsaddons-5.11 >=kde-frameworks/kwindowsystem-5.11 >=kde-frameworks/sonnet-5.11 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/ktextwidgets-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=94ea1ddfcd223886d37c43e0729f8e0a
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.10.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.10.0
deleted file mode 100644
index 355864e0000c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/ki18n-5.10 dev-qt/qtnetwork:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for converting units
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.10 dev-qt/qtnetwork:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kunitconversion-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=b529209257e3a828480e8913297e0e2e
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.11.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.11.0
index 77d7b81158c4..d92307592deb 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.11 dev-qt/qtnetwork:5 dev-qt/qtxml:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kunitconversion-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=53d4db0884991edceca10c426190b9b9
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.10.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.10.0
deleted file mode 100644
index df5f5ed5527a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kdbusaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/knotifications-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kwindowsystem-5.10 dev-libs/libgcrypt:0= dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing desktop-wide storage for passwords
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kdbusaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/knotifications-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kwindowsystem-5.10 dev-libs/libgcrypt:0= dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kwallet-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e0f0c01f678cf99de7e6571445a73c52
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.11.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.11.0
index 3c515b33ce39..548574f8afae 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/kdbusaddons-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kiconthemes-5.11 >=kde-frameworks/knotifications-5.11 >=kde-frameworks/kservice-5.11 >=kde-frameworks/kwidgetsaddons-5.11 >=kde-frameworks/kwindowsystem-5.11 dev-libs/libgcrypt:0= dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kwallet-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=3e71a30528048581e003034f2b8188db
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.10.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.10.0
deleted file mode 100644
index 1632bf269e16..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 nls? ( dev-qt/linguist-tools:5 ) test? ( dev-qt/designer:5 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=An assortment of high-level widgets for common tasks
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=nls test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kwidgetsaddons-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=ed209724642b198b31e1419bd573f2b5
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.11.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.11.0
index ee64a16d4843..4d5782f1a8f4 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kwidgetsaddons-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=8ea184d50c4808242923f7061a64a1f6
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.10.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.10.0
deleted file mode 100644
index b14ad03e7d3c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) nls? ( dev-qt/linguist-tools:5 ) X? ( x11-proto/xproto ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing access to certain properties and features of the window manager
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=nls X test doc debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+ MIT
-RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-RESTRICT=test
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kwindowsystem-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=274eab15c38639db41d4d81600c39aa9
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.11.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.11.0
index 050136a148a9..6ef5f4d56704 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.11.0
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/lib
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kwindowsystem-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=c0a8c8964dd2271d4d6a3d55684190cc
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.10.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.10.0
deleted file mode 100644
index 421e61ec0310..000000000000
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kglobalaccel-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kitemviews-5.10 >=kde-frameworks/ktextwidgets-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kwindowsystem-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 attica? ( >=kde-frameworks/attica-5.10 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=attica test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kglobalaccel-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kitemviews-5.10 >=kde-frameworks/ktextwidgets-5.10 >=kde-frameworks/kwidgetsaddons-5.10 >=kde-frameworks/kwindowsystem-5.10 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 attica? ( >=kde-frameworks/attica-5.10 ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kxmlgui-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=7c9bc9e540294c43c307421c68f1b728
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.11.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.11.0
index 4a1da6d5885a..c4777d1800e9 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.11 >=kde-frameworks/kconfigwidgets-5.11 >=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/kglobalaccel-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kiconthemes-5.11 >=kde-frameworks/kitemviews-5.11 >=kde-frameworks/ktextwidgets-5.11 >=kde-frameworks/kwidgetsaddons-5.11 >=kde-frameworks/kwindowsystem-5.11 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 attica? ( >=kde-frameworks/attica-5.11 ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kxmlgui-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=9af847bc4ce8754005af778132e29880
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.10.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.10.0
deleted file mode 100644
index fca45b2b86c8..000000000000
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kio-5.10 dev-qt/qtxml:5 !<kde-plasma/plasma-workspace-5.2.95 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=doc debug test
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kio-5.10 dev-qt/qtxml:5 !<kde-plasma/plasma-workspace-5.2.95 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/kxmlrpcclient-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=2b4e475bfcd4f4ac6f398536212e83ae
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.11.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.11.0
index ef5aaacc9df9..386b9301d8e5 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.11.0
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.11 >=kde-frameworks/ki18n-5.11 >=kde-frameworks/kio-5.11 dev-qt/qtxml:5 !<kde-plasma/plasma-workspace-5.2.95 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/kxmlrpcclient-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=74706345856fd7f38162a6022ea1eec8
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.10.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.10.0
deleted file mode 100644
index ceebce602b9f..000000000000
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtdbus:5 dev-qt/qtxml:5 net-misc/modemmanager !kde-plasma/libmm-qt virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=ModemManager bindings for Qt
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=doc debug test
-KEYWORDS=~amd64
-LICENSE=LGPL-2
-RDEPEND=dev-qt/qtdbus:5 dev-qt/qtxml:5 net-misc/modemmanager !kde-plasma/libmm-qt >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/modemmanager-qt-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=259ebab127fbf1f8a8d8e6aab0bfb5e1
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.11.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.11.0
index b75f6e878dc2..c5efc88c2f39 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtxml:5 net-misc/modemmanager !kde-plasma/libmm-qt >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/modemmanager-qt-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=05d09ee7a49bdf8c544b76347f6f9800
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.10.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.10.0
deleted file mode 100644
index 1be0ce6e9d32..000000000000
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtdbus:5 dev-qt/qtnetwork:5 || ( >=net-misc/networkmanager-0.9.10.0[consolekit,teamd=] >=net-misc/networkmanager-0.9.10.0[systemd,teamd=] ) !kde-frameworks/libnm-qt !kde-plasma/libnm-qt !net-libs/libnm-qt virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=NetworkManager bindings for Qt
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=teamd doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=dev-qt/qtdbus:5 dev-qt/qtnetwork:5 || ( >=net-misc/networkmanager-0.9.10.0[consolekit,teamd=] >=net-misc/networkmanager-0.9.10.0[systemd,teamd=] ) !kde-frameworks/libnm-qt !kde-plasma/libnm-qt !net-libs/libnm-qt >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/networkmanager-qt-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=3f6327c68548d8576644a022c549fdb1
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.11.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.11.0
index 05fc0a85dadb..9bc497a375c0 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtnetwork:5 || ( >=net-misc/networkmanager-0.9.10.0[consolekit,teamd=] >=net-misc/networkmanager-0.9.10.0[systemd,teamd=] ) !kde-frameworks/libnm-qt !kde-plasma/libnm-qt !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/networkmanager-qt-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=b3bc833aa982073530fc3e76f019db4c
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.10.0 b/metadata/md5-cache/kde-frameworks/plasma-5.10.0
deleted file mode 100644
index cb80122aeefb..000000000000
--- a/metadata/md5-cache/kde-frameworks/plasma-5.10.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.10 >=kde-frameworks/karchive-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kdbusaddons-5.10 >=kde-frameworks/kdeclarative-5.10 >=kde-frameworks/kglobalaccel-5.10 >=kde-frameworks/kguiaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/knotifications-5.10 >=kde-frameworks/kpackage-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwindowsystem-5.10 >=kde-frameworks/kxmlgui-5.10 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 egl? ( media-libs/mesa[egl] ) opengl? ( dev-qt/qtgui:5[opengl(+),-gles2] virtual/opengl ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kdoctools-5.10 dev-qt/qtquick1:5 X? ( x11-proto/xproto ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma framework
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=egl opengl X test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.10 >=kde-frameworks/karchive-5.10 >=kde-frameworks/kconfig-5.10 >=kde-frameworks/kconfigwidgets-5.10 >=kde-frameworks/kcoreaddons-5.10 >=kde-frameworks/kdbusaddons-5.10 >=kde-frameworks/kdeclarative-5.10 >=kde-frameworks/kglobalaccel-5.10 >=kde-frameworks/kguiaddons-5.10 >=kde-frameworks/ki18n-5.10 >=kde-frameworks/kiconthemes-5.10 >=kde-frameworks/kio-5.10 >=kde-frameworks/knotifications-5.10 >=kde-frameworks/kpackage-5.10 >=kde-frameworks/kservice-5.10 >=kde-frameworks/kwindowsystem-5.10 >=kde-frameworks/kxmlgui-5.10 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 egl? ( media-libs/mesa[egl] ) opengl? ( dev-qt/qtgui:5[opengl(+),-gles2] virtual/opengl ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-RESTRICT=test
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/plasma-framework-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=55ecf9df3f77919d90dbf7f8a43e9d1a
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.11.0 b/metadata/md5-cache/kde-frameworks/plasma-5.11.0
index c286b0ad9266..d26eaa187dfd 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.11.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.11 >=kde-frameworks/karchive-5.11 >=kde-f
 RESTRICT=test
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/plasma-framework-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=132cee1da837429cd25df8509c7442a6
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.10.0 b/metadata/md5-cache/kde-frameworks/solid-5.10.0
deleted file mode 100644
index 3bd404b7a00e..000000000000
--- a/metadata/md5-cache/kde-frameworks/solid-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/udev nls? ( dev-qt/linguist-tools:5 ) test? ( dev-qt/qtconcurrent:5 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing platform independent hardware discovery, abstraction, and management
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=nls test doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/udev >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/solid-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=89c1d27e7b0d1e3cab324a6d516dff42
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.11.0 b/metadata/md5-cache/kde-frameworks/solid-5.11.0
index 27b51636086a..0b3768ea4e40 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/udev >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/solid-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=0c9e0f7e7f9f7f533bab8a7245ca30cf
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.10.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.10.0
deleted file mode 100644
index 4eb9f0d636c2..000000000000
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) nls? ( dev-qt/linguist-tools:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for providing spell-checking capabilities through abstraction of popular backends
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=+aspell hunspell nls doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/sonnet-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=f0144f342bb230d8d343eaed66ea1e14
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.11.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.11.0
index 32405c4da6ff..9a96f9e0d2dd 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ LGPL-2.1+
 RDEPEND=dev-qt/qtgui:5 dev-qt/qtwidgets:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/sonnet-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=b69cd272229b15bb5706e912f5639069
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.10.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.10.0
deleted file mode 100644
index cf0d34d0b106..000000000000
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10 doc? ( >=kde-frameworks/kapidox-5.10 app-doc/doxygen ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for managing threads using job and queue-based interfaces
-EAPI=5
-HOMEPAGE=http://www.kde.org/
-IUSE=doc debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
-SLOT=5/5.10
-SRC_URI=mirror://kde/stable/frameworks/5.10/threadweaver-5.10.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=cc61425a183b83105c34c3d628bce216
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.11.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.11.0
index 712eb476cf7a..e6b5cf64acf3 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.11.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.11.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5/5.11
 SRC_URI=mirror://kde/stable/frameworks/5.11/threadweaver-5.11.0.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=2819ee04b04b9618df8ea59614aa03ea
diff --git a/metadata/md5-cache/kde-misc/about-distro-2.0.1 b/metadata/md5-cache/kde-misc/about-distro-2.0.1
index 62fb6850f9bf..adad45eed5c0 100644
--- a/metadata/md5-cache/kde-misc/about-distro-2.0.1
+++ b/metadata/md5-cache/kde-misc/about-distro-2.0.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/solid-5.10.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/solid-5.11.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KCM displaying distribution and system information
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/playground/base/about-distro
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/solid-5.10.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-misc/about-distro:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/solid-5.11.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-misc/about-distro:4 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=http://www.gentoo.org/images/glogo-small.png mirror://kde/stable/about-distro/2.0.1/src/about-distro-2.0.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=cfcdec52374a7dde90639f2e2ef7bf2b
diff --git a/metadata/md5-cache/kde-misc/wacomtablet-2.0.2 b/metadata/md5-cache/kde-misc/wacomtablet-2.0.2
deleted file mode 100644
index 66014795d025..000000000000
--- a/metadata/md5-cache/kde-misc/wacomtablet-2.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libX11 x11-libs/libXi x11-libs/libXrandr sys-devel/gettext x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) 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=]
-DESCRIPTION=KControl module for Wacom tablets
-EAPI=5
-HOMEPAGE=http://kde-apps.org/content/show.php?action=content&content=114856
-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_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_ja linguas_kk linguas_km linguas_ko linguas_lt linguas_mai linguas_mr linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW test +handbook aqua
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libX11 x11-libs/libXi x11-libs/libXrandr kde-apps/oxygen-icons linguas_ar? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_kk(+)] ) linguas_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_mr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_mr(+)] ) linguas_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-apps/kde4-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=http://www.kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.0.2.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	563af72cd58cf3ce69c1de54a1883e57	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=5f58b083f18182456f63f598fb994229
diff --git a/metadata/md5-cache/kde-misc/wacomtablet-2.1.0 b/metadata/md5-cache/kde-misc/wacomtablet-2.1.0
index b41106d518ae..5d8b612bba04 100644
--- a/metadata/md5-cache/kde-misc/wacomtablet-2.1.0
+++ b/metadata/md5-cache/kde-misc/wacomtablet-2.1.0
@@ -4,10 +4,10 @@ DESCRIPTION=KControl module for Wacom tablets
 EAPI=5
 HOMEPAGE=http://kde-apps.org/content/show.php?action=content&content=114856
 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_eo linguas_es linguas_et linguas_fi linguas_fr linguas_ga linguas_gl linguas_hu linguas_ja linguas_kk linguas_km linguas_ko linguas_lt linguas_mai linguas_mr linguas_nb linguas_nds linguas_nl linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sv linguas_tr linguas_ug linguas_uk linguas_zh_CN linguas_zh_TW test +handbook aqua
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libX11 x11-libs/libXi x11-libs/libXrandr kde-apps/oxygen-icons linguas_ar? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ar(+)] ) linguas_bg? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fi? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_fi(+)] ) linguas_fr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_ja? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_kk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_kk(+)] ) linguas_km? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_km(+)] ) linguas_ko? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ko(+)] ) linguas_lt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_mai? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_mai(+)] ) linguas_mr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_mr(+)] ) linguas_nb? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nds? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nds(+)] ) linguas_nl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pa? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pa(+)] ) linguas_pl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sl? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sl(+)] ) linguas_sv? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_uk? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_uk(+)] ) linguas_zh_CN? ( >=kde-apps/kde4-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) linguas_zh_TW? ( >=kde-apps/kde4-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=http://www.kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.1.0.tar.xz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde4-base	563af72cd58cf3ce69c1de54a1883e57	kde4-functions	99e770658f27aaf2c8a5850af7598b18	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=054358ff45136fbbb774880ab198afe3
+_md5_=6728e8904a890065735aece96f0fc96d
diff --git a/metadata/md5-cache/kde-plasma/baloo-5.9.1 b/metadata/md5-cache/kde-plasma/baloo-5.9.1
index 3f4c2228540d..14c3c4c360f6 100644
--- a/metadata/md5-cache/kde-plasma/baloo-5.9.1
+++ b/metadata/md5-cache/kde-plasma/baloo-5.9.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kcrash-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kidletime-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/solid-5.10.0:5 >=kde-plasma/kfilemetadata-5.9.1:5 =dev-libs/xapian-1.2*[chert] dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 sys-apps/attr !<kde-base/nepomuk-4.12.50 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kcrash-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kidletime-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/solid-5.11.0:5 >=kde-plasma/kfilemetadata-5.9.1:5 =dev-libs/xapian-1.2*[chert] dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 sys-apps/attr !<kde-base/nepomuk-4.12.50 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Framework for searching and managing metadata
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kauth-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kcrash-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kidletime-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/solid-5.10.0:5 >=kde-plasma/kfilemetadata-5.9.1:5 =dev-libs/xapian-1.2*[chert] dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 sys-apps/attr !<kde-base/nepomuk-4.12.50 !kde-base/baloo:4[-minimal(-)] !kde-base/baloo:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kauth-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kcrash-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kidletime-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/solid-5.11.0:5 >=kde-plasma/kfilemetadata-5.9.1:5 =dev-libs/xapian-1.2*[chert] dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 sys-apps/attr !<kde-base/nepomuk-4.12.50 !kde-base/baloo:4[-minimal(-)] !kde-base/baloo:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/baloo-5.9.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=42c04db39987c6b24c31b455f3652939
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.3.1-r1 b/metadata/md5-cache/kde-plasma/bluedevil-5.3.1-r1
index 257b43eea773..d5f923f82529 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.3.1-r1
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.3.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/bluez-qt-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kded-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/plasma-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-misc/shared-mime-info >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/bluez-qt-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kded-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/plasma-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-misc/shared-mime-info >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Bluetooth stack for KDE
 EAPI=5
 HOMEPAGE=http://projects.kde.org/projects/extragear/base/bluedevil
 IUSE=debug
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/bluez-qt-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kded-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/plasma-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-plasma/kde-cli-tools-5.3.1:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !net-wireless/bluedevil !net-wireless/kbluetooth >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/bluez-qt-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kded-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/plasma-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-plasma/kde-cli-tools-5.3.1:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !net-wireless/bluedevil !net-wireless/kbluetooth >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/bluedevil-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=55a88c542373912061143ef21c89391e
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.3.1 b/metadata/md5-cache/kde-plasma/breeze-5.3.1
index 240297fd6be5..8d55608e3092 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.3.1
+++ b/metadata/md5-cache/kde-plasma/breeze-5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.10.0:5 >=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kguiaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-plasma/kdecoration-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb kde4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/frameworkintegration-5.11.0:5 >=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kguiaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-plasma/kdecoration-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb kde4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Breeze visual style for the Plasma desktop
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/breeze
 IUSE=kde4 debug
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.10.0:5 >=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kguiaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-plasma/kdecoration-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb kde4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=kde-plasma/kde-cli-tools-5.3.1:5 !kde-base/breeze >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.11.0:5 >=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kguiaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-plasma/kdecoration-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb kde4? ( kde-base/kdelibs:4 x11-libs/libX11 ) >=kde-plasma/kde-cli-tools-5.3.1:5 !kde-base/breeze >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/breeze-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=24c664123235cfeddf739641793e35bf
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.3.1 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.3.1
index e8def5e10d0c..3cf0319faca0 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.3.1
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.3.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/kdesu-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 handbook? ( >=kde-frameworks/kdoctools-5.10.0:5 ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/kdesu-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 handbook? ( >=kde-frameworks/kdoctools-5.11.0:5 ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kde-cli-tools
 IUSE=X test debug +handbook test
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/kdesu-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) handbook? ( !kde-base/kdesu[handbook] ) !kde-base/kde-cli-tools >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/kdesu-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 X? ( dev-qt/qtx11extras:5 x11-libs/libX11 ) handbook? ( !kde-base/kdesu[handbook] ) !kde-base/kde-cli-tools >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/kde-cli-tools-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=eff9ff7e0732bdb8ee4359c1e07ce186
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.3.1 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.3.1
index 48dd8d7731c5..3902f4c1d6d2 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.3.1
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.10.0:5 >=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/knewstuff-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 dev-libs/glib:2 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/gtk+:2 x11-libs/gtk+:3 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.11.0:5 >=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/knewstuff-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 dev-libs/glib:2 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/gtk+:2 x11-libs/gtk+:3 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE systemsettings kcm to set GTK application look&feel
 EAPI=5
 HOMEPAGE=http://projects.kde.org/kde-gtk-config
 IUSE=debug
 KEYWORDS=~amd64
 LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/karchive-5.10.0:5 >=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/knewstuff-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 dev-libs/glib:2 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/gtk+:2 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.3.1:5 !kde-base/kde-gtk-config !kde-misc/kde-gtk-config >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/karchive-5.11.0:5 >=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/knewstuff-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 dev-libs/glib:2 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/gtk+:2 x11-libs/gtk+:3 >=kde-plasma/kde-cli-tools-5.3.1:5 !kde-base/kde-gtk-config !kde-misc/kde-gtk-config >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/kde-gtk-config-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=6e72df4b91d716597b7136ecbd68cb56
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.3.1 b/metadata/md5-cache/kde-plasma/kdecoration-5.3.1
index c795999483d5..ba8c54bcdcb8 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.3.1
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtgui:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=dev-qt/qtgui:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Plugin based library to create window decorations
 EAPI=5
 HOMEPAGE=http://www.kde.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtgui:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/kdecoration-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=e9b5aedcc50caac8edf50e9dd76a7e73
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.3.1 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.3.1
index 423fca148d06..4275a92b24dc 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.3.1
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/knewstuff-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/kpackage-5.10.0:5 >=kde-frameworks/kross-5.10.0:5 >=kde-frameworks/krunner-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kunitconversion-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/plasma-5.10.0:5 >=kde-frameworks/sonnet-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ibus? ( app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/knewstuff-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/kpackage-5.11.0:5 >=kde-frameworks/kross-5.11.0:5 >=kde-frameworks/krunner-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kunitconversion-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/plasma-5.11.0:5 >=kde-frameworks/sonnet-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ibus? ( app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Extra Plasma applets and engines
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=ibus scim debug
 KEYWORDS=~amd64
 LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/knewstuff-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/kpackage-5.10.0:5 >=kde-frameworks/kross-5.10.0:5 >=kde-frameworks/krunner-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kunitconversion-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/plasma-5.10.0:5 >=kde-frameworks/sonnet-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ibus? ( app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) !kde-base/kdeplasma-addons >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/karchive-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/knewstuff-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/kpackage-5.11.0:5 >=kde-frameworks/kross-5.11.0:5 >=kde-frameworks/krunner-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kunitconversion-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/plasma-5.11.0:5 >=kde-frameworks/sonnet-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ibus? ( app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) scim? ( app-i18n/scim ) !kde-base/kdeplasma-addons >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/kdeplasma-addons-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=1d977ff4e6b006df87690866b7199948
diff --git a/metadata/md5-cache/kde-plasma/kfilemetadata-5.9.1 b/metadata/md5-cache/kde-plasma/kfilemetadata-5.9.1
index 4afc1c6282de..b46abc7aebb8 100644
--- a/metadata/md5-cache/kde-plasma/kfilemetadata-5.9.1
+++ b/metadata/md5-cache/kde-plasma/kfilemetadata-5.9.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 dev-qt/qtxml:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 dev-qt/qtxml:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Library for extracting file metadata
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=epub exif ffmpeg libav pdf taglib debug test
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 dev-qt/qtxml:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) !kde-base/kfilemetadata:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/karchive-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 dev-qt/qtxml:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) !kde-base/kfilemetadata:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/kfilemetadata-5.9.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=6a73c1bd2534dc53f8bb2034f68ebd3a
diff --git a/metadata/md5-cache/kde-plasma/khelpcenter-5.3.1 b/metadata/md5-cache/kde-plasma/khelpcenter-5.3.1
index 9924dcdb0d7d..4ba94c301c59 100644
--- a/metadata/md5-cache/kde-plasma/khelpcenter-5.3.1
+++ b/metadata/md5-cache/kde-plasma/khelpcenter-5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/kcodecs-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/khtml-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kinit-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kparts-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 handbook? ( >=kde-frameworks/kdoctools-5.10.0:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/kcodecs-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/khtml-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kinit-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kparts-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 handbook? ( >=kde-frameworks/kdoctools-5.11.0:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=The KDE Help Center
 EAPI=5
 HOMEPAGE=http://www.kde.org/ http://userbase.kde.org/KHelpCenter
 IUSE=debug +handbook
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/kcodecs-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/khtml-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kinit-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kparts-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-plasma/kde-cli-tools-5.3.1:5 !kde-base/khelpcenter >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/kcodecs-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/khtml-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kinit-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kparts-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=kde-plasma/kde-cli-tools-5.3.1:5 !kde-base/khelpcenter >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/khelpcenter-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=36824da6f489195009297b342f9e1b14
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.3.1 b/metadata/md5-cache/kde-plasma/khotkeys-5.3.1
index dc6eb67e56a5..60f229b82eec 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.3.1
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5[X] >=kde-frameworks/kglobalaccel-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/ktextwidgets-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-plasma/plasma-workspace-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-proto/xproto >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 handbook? ( >=kde-frameworks/kdoctools-5.10.0:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5[X] >=kde-frameworks/kglobalaccel-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/ktextwidgets-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-plasma/plasma-workspace-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-proto/xproto >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 handbook? ( >=kde-frameworks/kdoctools-5.11.0:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE workspace hotkey module
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug +handbook
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5[X] >=kde-frameworks/kglobalaccel-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/ktextwidgets-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-plasma/plasma-workspace-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 >=kde-frameworks/kded-5.10.0:5 >=kde-plasma/kde-cli-tools-5.3.1:5 !kde-base/khotkeys !kde-base/systemsettings >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5[X] >=kde-frameworks/kglobalaccel-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/ktextwidgets-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-plasma/plasma-workspace-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 >=kde-frameworks/kded-5.11.0:5 >=kde-plasma/kde-cli-tools-5.3.1:5 !kde-base/khotkeys !kde-base/systemsettings >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/khotkeys-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=d99efba04a5c506b4f1faaa2712d0888
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.3.1 b/metadata/md5-cache/kde-plasma/kinfocenter-5.3.1
index 97405c51307d..b4a5eddac887 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.3.1
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.3.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/solid-5.10.0:5 dev-qt/qtgui:5[opengl(+)] dev-qt/qtwidgets:5 gles? ( dev-qt/qtgui:5[gles2] || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] ) ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( virtual/glu virtual/opengl ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( >=kde-plasma/kwayland-5.3.1:5 ) X? ( x11-libs/libX11 ) !kde-base/kcontrol !kde-base/kinfocenter !kde-misc/about-distro >=kde-frameworks/plasma-5.10.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 handbook? ( >=kde-frameworks/kdoctools-5.10.0:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/solid-5.11.0:5 dev-qt/qtgui:5[opengl(+)] dev-qt/qtwidgets:5 gles? ( dev-qt/qtgui:5[gles2] || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] ) ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( virtual/glu virtual/opengl ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( >=kde-plasma/kwayland-5.3.1:5 ) X? ( x11-libs/libX11 ) !kde-base/kcontrol !kde-base/kinfocenter !kde-misc/about-distro >=kde-frameworks/plasma-5.11.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 handbook? ( >=kde-frameworks/kdoctools-5.11.0:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=A utility that provides information about a computer system
 EAPI=5
 HOMEPAGE=http://www.kde.org/applications/system/kinfocenter/
 IUSE=egl gles ieee1394 +opengl +pci samba nfs wayland X debug +handbook
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/solid-5.10.0:5 dev-qt/qtgui:5[opengl(+)] dev-qt/qtwidgets:5 gles? ( dev-qt/qtgui:5[gles2] || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] ) ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( virtual/glu virtual/opengl ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( >=kde-plasma/kwayland-5.3.1:5 ) X? ( x11-libs/libX11 ) !kde-base/kcontrol !kde-base/kinfocenter !kde-misc/about-distro >=kde-plasma/kde-cli-tools-5.3.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/solid-5.11.0:5 dev-qt/qtgui:5[opengl(+)] dev-qt/qtwidgets:5 gles? ( dev-qt/qtgui:5[gles2] || ( media-libs/mesa[egl,gles1] media-libs/mesa[egl,gles2] ) ) ieee1394? ( sys-libs/libraw1394 ) nfs? ( net-fs/nfs-utils ) opengl? ( virtual/glu virtual/opengl ) pci? ( sys-apps/pciutils ) samba? ( net-fs/samba[server(+)] ) wayland? ( >=kde-plasma/kwayland-5.3.1:5 ) X? ( x11-libs/libX11 ) !kde-base/kcontrol !kde-base/kinfocenter !kde-misc/about-distro >=kde-plasma/kde-cli-tools-5.3.1:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 REQUIRED_USE=egl? ( || ( gles opengl ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/kinfocenter-5.3.1.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=f988e24410e9cc98eaca96a0e60464ac
diff --git a/metadata/md5-cache/kde-plasma/kio-extras-5.3.1 b/metadata/md5-cache/kde-plasma/kio-extras-5.3.1
index 4bc2f2fb5c25..ae0fe7ccfe7f 100644
--- a/metadata/md5-cache/kde-plasma/kio-extras-5.3.1
+++ b/metadata/md5-cache/kde-plasma/kio-extras-5.3.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.10.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.10.0:5 >=kde-frameworks/kcodecs-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/kdnssd-5.10.0:5 >=kde-frameworks/kguiaddons-5.10.0:5 >=kde-frameworks/khtml-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kparts-5.10.0:5 >=kde-frameworks/kpty-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/solid-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/jpeg:0 exif? ( media-gfx/exiv2:= ) mtp? ( media-libs/libmtp:= ) phonon? ( media-libs/phonon[qt5] ) samba? ( || ( <net-fs/samba-4.0.0_alpha1[smbclient] >=net-fs/samba-4.0.0_alpha1[client] ) ) sftp? ( >=net-libs/libssh-0.6.0:=[sftp] ) slp? ( net-libs/openslp ) x11-misc/shared-mime-info >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 handbook? ( >=kde-frameworks/kdoctools-5.10.0:5 ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.11.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.11.0:5 >=kde-frameworks/kcodecs-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/kdnssd-5.11.0:5 >=kde-frameworks/kguiaddons-5.11.0:5 >=kde-frameworks/khtml-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kparts-5.11.0:5 >=kde-frameworks/kpty-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/solid-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/jpeg:0 exif? ( media-gfx/exiv2:= ) mtp? ( media-libs/libmtp:= ) phonon? ( media-libs/phonon[qt5] ) samba? ( || ( <net-fs/samba-4.0.0_alpha1[smbclient] >=net-fs/samba-4.0.0_alpha1[client] ) ) sftp? ( >=net-libs/libssh-0.6.0:=[sftp] ) slp? ( net-libs/openslp ) x11-misc/shared-mime-info >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 handbook? ( >=kde-frameworks/kdoctools-5.11.0:5 ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KIO plugins present a filesystem-like view of arbitrary data
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kio-extras
 IUSE=exif mtp phonon samba +sftp slp test debug +handbook test
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.10.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.10.0:5 >=kde-frameworks/kcodecs-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/kdnssd-5.10.0:5 >=kde-frameworks/kguiaddons-5.10.0:5 >=kde-frameworks/khtml-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kparts-5.10.0:5 >=kde-frameworks/kpty-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/solid-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/jpeg:0 exif? ( media-gfx/exiv2:= ) mtp? ( media-libs/libmtp:= ) phonon? ( media-libs/phonon[qt5] ) samba? ( || ( <net-fs/samba-4.0.0_alpha1[smbclient] >=net-fs/samba-4.0.0_alpha1[client] ) ) sftp? ( >=net-libs/libssh-0.6.0:=[sftp] ) slp? ( net-libs/openslp ) >=kde-frameworks/kded-5.10.0:5 !kde-apps/kdebase-kioslaves:4[-minimal(-)] !kde-base/kcontrol:4 !kde-base/kdebase-kioslaves:4[-minimal(-)] !kde-base/kio-extras >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/karchive-5.11.0:5[bzip2,lzma] >=kde-frameworks/kbookmarks-5.11.0:5 >=kde-frameworks/kcodecs-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/kdnssd-5.11.0:5 >=kde-frameworks/kguiaddons-5.11.0:5 >=kde-frameworks/khtml-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kparts-5.11.0:5 >=kde-frameworks/kpty-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/solid-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 virtual/jpeg:0 exif? ( media-gfx/exiv2:= ) mtp? ( media-libs/libmtp:= ) phonon? ( media-libs/phonon[qt5] ) samba? ( || ( <net-fs/samba-4.0.0_alpha1[smbclient] >=net-fs/samba-4.0.0_alpha1[client] ) ) sftp? ( >=net-libs/libssh-0.6.0:=[sftp] ) slp? ( net-libs/openslp ) >=kde-frameworks/kded-5.11.0:5 !kde-apps/kdebase-kioslaves:4[-minimal(-)] !kde-base/kcontrol:4 !kde-base/kdebase-kioslaves:4[-minimal(-)] !kde-base/kio-extras >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/kio-extras-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=a327a4c8a9579402b4c2a3342bdff2fb
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.3.1 b/metadata/md5-cache/kde-plasma/kmenuedit-5.3.1
index 228772ed7e59..7251b4ecde8e 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.3.1
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/sonnet-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 hotkeys? ( >=kde-plasma/khotkeys-5.3.1:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 handbook? ( >=kde-frameworks/kdoctools-5.10.0:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/sonnet-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 hotkeys? ( >=kde-plasma/khotkeys-5.3.1:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 handbook? ( >=kde-frameworks/kdoctools-5.11.0:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE menu editor
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kmenuedit
 IUSE=+hotkeys debug +handbook
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/sonnet-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 hotkeys? ( >=kde-plasma/khotkeys-5.3.1:5 ) !kde-base/kmenuedit >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/sonnet-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 hotkeys? ( >=kde-plasma/khotkeys-5.3.1:5 ) !kde-base/kmenuedit >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/kmenuedit-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=6de2ccebe8a4cccb331975b20a081583
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.3.1 b/metadata/md5-cache/kde-plasma/kscreen-5.3.1
index 9752573d94e3..5797503b3d4d 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.3.1
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-plasma/libkscreen-5.3.1:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kglobalaccel-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-plasma/libkscreen-5.3.1:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kglobalaccel-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE screen management
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/extragear/base/kscreen
 IUSE=debug
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-plasma/libkscreen-5.3.1:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kglobalaccel-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-plasma/kde-cli-tools-5.3.1:5 dev-qt/qtgraphicaleffects:5 !kde-misc/kscreen >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-plasma/libkscreen-5.3.1:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kglobalaccel-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=kde-plasma/kde-cli-tools-5.3.1:5 dev-qt/qtgraphicaleffects:5 !kde-misc/kscreen >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/kscreen-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=56b388fb6752ff9c11a84ec784db2e37
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.3.1 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.3.1
index 169d9d017459..7cd25c4efed1 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.3.1
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kwallet-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kwallet-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE implementation of ssh-askpass with Kwallet integration
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/ksshaskpass
 IUSE=debug
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kwallet-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 dev-qt/qtwidgets:5 !net-misc/ksshaskpass >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kwallet-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 dev-qt/qtwidgets:5 !net-misc/ksshaskpass >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/ksshaskpass-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=9a7883154651d14cfbae609274983f20
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.3.1 b/metadata/md5-cache/kde-plasma/ksysguard-5.3.1
index 2642370fcad7..603288be4c82 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.3.1
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-plasma/libksysguard-5.3.1:5[processui] >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kitemviews-5.10.0:5 >=kde-frameworks/knewstuff-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 lm_sensors? ( sys-apps/lm_sensors ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 handbook? ( >=kde-frameworks/kdoctools-5.10.0:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-plasma/libksysguard-5.3.1:5[processui] >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kitemviews-5.11.0:5 >=kde-frameworks/knewstuff-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 lm_sensors? ( sys-apps/lm_sensors ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 handbook? ( >=kde-frameworks/kdoctools-5.11.0:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Network-enabled task manager and system monitor
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=lm_sensors debug +handbook
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=>=kde-plasma/libksysguard-5.3.1:5[processui] >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kitemviews-5.10.0:5 >=kde-frameworks/knewstuff-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-base/ksysguard >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-plasma/libksysguard-5.3.1:5[processui] >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kitemviews-5.11.0:5 >=kde-frameworks/knewstuff-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-base/ksysguard >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/ksysguard-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=a5cde18366055533f7175df0dd84c379
diff --git a/metadata/md5-cache/kde-plasma/kwayland-5.3.1 b/metadata/md5-cache/kde-plasma/kwayland-5.3.1
index 213eb4db8f99..e1bedcfeb979 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-5.3.1
+++ b/metadata/md5-cache/kde-plasma/kwayland-5.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=dev-libs/wayland-1.3.0 dev-qt/qtgui:5 media-libs/mesa[egl] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=dev-libs/wayland-1.3.0 dev-qt/qtgui:5 media-libs/mesa[egl] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kwayland
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/wayland-1.3.0 dev-qt/qtgui:5 media-libs/mesa[egl] !kde-base/k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/kwayland-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=59a101e5f133d7ca25e815c4a9461d57
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.3.1-r1 b/metadata/md5-cache/kde-plasma/kwin-5.3.1-r1
index 09bb747b828c..ade9347586cc 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.3.1-r1
+++ b/metadata/md5-cache/kde-plasma/kwin-5.3.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.10.0:5 >=kde-frameworks/kauth-5.10.0:5 >=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kcrash-5.10.0:5 >=kde-frameworks/kdeclarative-5.10.0:5 >=kde-frameworks/kglobalaccel-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kinit-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/knewstuff-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5[X] >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/plasma-5.10.0:5 >=kde-plasma/kdecoration-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[gles2=,opengl(+)] dev-qt/qtmultimedia:5[qml] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras media-libs/libepoxy x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms wayland? ( >=kde-plasma/kwayland-5.3.1:5 >=dev-libs/libinput-0.10 >=dev-libs/wayland-1.2 virtual/libudev:= >=x11-libs/libxkbcommon-0.4.1 ) dev-qt/designer:5 dev-qt/qtconcurrent:5 media-libs/mesa[egl,gles2?] x11-proto/xproto test? ( x11-libs/xcb-util-wm ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 handbook? ( >=kde-frameworks/kdoctools-5.10.0:5 ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.11.0:5 >=kde-frameworks/kauth-5.11.0:5 >=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kcrash-5.11.0:5 >=kde-frameworks/kdeclarative-5.11.0:5 >=kde-frameworks/kglobalaccel-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kinit-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/knewstuff-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5[X] >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/plasma-5.11.0:5 >=kde-plasma/kdecoration-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[gles2=,opengl(+)] dev-qt/qtmultimedia:5[qml] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras media-libs/libepoxy x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms wayland? ( >=kde-plasma/kwayland-5.3.1:5 >=dev-libs/libinput-0.10 >=dev-libs/wayland-1.2 virtual/libudev:= >=x11-libs/libxkbcommon-0.4.1 ) dev-qt/designer:5 dev-qt/qtconcurrent:5 media-libs/mesa[egl,gles2?] x11-proto/xproto test? ( x11-libs/xcb-util-wm ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 handbook? ( >=kde-frameworks/kdoctools-5.11.0:5 ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE window manager
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=gles2 wayland test debug +handbook test
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.10.0:5 >=kde-frameworks/kauth-5.10.0:5 >=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kcrash-5.10.0:5 >=kde-frameworks/kdeclarative-5.10.0:5 >=kde-frameworks/kglobalaccel-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kinit-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/knewstuff-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5[X] >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/plasma-5.10.0:5 >=kde-plasma/kdecoration-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[gles2=,opengl(+)] dev-qt/qtmultimedia:5[qml] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras media-libs/libepoxy x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms wayland? ( >=kde-plasma/kwayland-5.3.1:5 >=dev-libs/libinput-0.10 >=dev-libs/wayland-1.2 virtual/libudev:= >=x11-libs/libxkbcommon-0.4.1 ) >=kde-plasma/kde-cli-tools-5.3.1:5 !kde-base/kwin !kde-base/systemsettings >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.11.0:5 >=kde-frameworks/kauth-5.11.0:5 >=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kcrash-5.11.0:5 >=kde-frameworks/kdeclarative-5.11.0:5 >=kde-frameworks/kglobalaccel-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kinit-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/knewstuff-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5[X] >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/plasma-5.11.0:5 >=kde-plasma/kdecoration-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[gles2=,opengl(+)] dev-qt/qtmultimedia:5[qml] dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras media-libs/libepoxy x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libxcb-1.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms wayland? ( >=kde-plasma/kwayland-5.3.1:5 >=dev-libs/libinput-0.10 >=dev-libs/wayland-1.2 virtual/libudev:= >=x11-libs/libxkbcommon-0.4.1 ) >=kde-plasma/kde-cli-tools-5.3.1:5 !kde-base/kwin !kde-base/systemsettings >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/kwin-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=9bad61272881d7575ebbced06fae7fe3
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.3.1 b/metadata/md5-cache/kde-plasma/kwrited-5.3.1
index 29460c58983b..c928e00d62a5 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.3.1
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/kpty-5.10.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/kpty-5.11.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE daemon listening for wall and write messages
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/kpty-5.10.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-base/kwrited >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/kpty-5.11.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-base/kwrited >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/kwrited-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=2a02dd809d420c6e4c6cc957db160e2c
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.3.1 b/metadata/md5-cache/kde-plasma/libkscreen-5.3.1
index feefb1246186..e1363352ee2a 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.3.1
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libxcb >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libxcb >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE screen management library
 EAPI=5
 HOMEPAGE=http://www.kde.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 x11-libs/libxcb !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/libkscreen-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=4b766fdad59bfeecbe1044398c0a3d2b
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.3.1 b/metadata/md5-cache/kde-plasma/libksysguard-5.3.1
index 77eb55125e80..32ea1e43a1cc 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.3.1
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib processui? ( dev-qt/qtwebkit:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/plasma-5.10.0:5 X? ( x11-proto/xproto ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib processui? ( dev-qt/qtwebkit:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXres ) >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/plasma-5.11.0:5 X? ( x11-proto/xproto ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Task management and system monitoring library
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=+processui X test debug test
 KEYWORDS=~amd64
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib processui? ( dev-qt/qtwebkit:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXres ) !kde-base/ksysguard:4 !kde-base/libksysguard >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kauth-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-libs/zlib processui? ( dev-qt/qtwebkit:5 ) X? ( dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXres ) !kde-base/ksysguard:4 !kde-base/libksysguard >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/libksysguard-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=3ac8090f11494ff141729092fd2a2949
diff --git a/metadata/md5-cache/kde-plasma/milou-5.3.1 b/metadata/md5-cache/kde-plasma/milou-5.3.1
index e87baca7f3a8..b4755ab2a8ae 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.3.1
+++ b/metadata/md5-cache/kde-plasma/milou-5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdeclarative-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/krunner-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/plasma-5.10.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdeclarative-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/krunner-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/plasma-5.11.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Dedicated search application built on top of Baloo
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/milou
 IUSE=debug
 KEYWORDS=~amd64
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdeclarative-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/krunner-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/plasma-5.10.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-base/milou >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdeclarative-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/krunner-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/plasma-5.11.0:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 !kde-base/milou >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/milou-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=1f00523f519bd6f26e2def8f36de992a
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.3.1 b/metadata/md5-cache/kde-plasma/oxygen-5.3.1
index 1c0bc546f2d3..380fa8dd8d08 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.3.1
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kguiaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-plasma/kdecoration-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb !kde-base/kdebase-cursors !kde-base/oxygen >=kde-frameworks/kservice-5.10.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/frameworkintegration-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kguiaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-plasma/kdecoration-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb !kde-base/kdebase-cursors !kde-base/oxygen >=kde-frameworks/kservice-5.11.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE window manager theme
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/oxygen
 IUSE=debug
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kguiaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-plasma/kdecoration-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb !kde-base/kdebase-cursors !kde-base/oxygen >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kguiaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-plasma/kdecoration-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libxcb !kde-base/kdebase-cursors !kde-base/oxygen >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/oxygen-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=e87aac44bf5a5b487b86f01c64ea0fd9
diff --git a/metadata/md5-cache/kde-plasma/oxygen-fonts-5.3.1 b/metadata/md5-cache/kde-plasma/oxygen-fonts-5.3.1
index 1ca5ca4b1cde..69055c908b41 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-fonts-5.3.1
+++ b/metadata/md5-cache/kde-plasma/oxygen-fonts-5.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.10.0:5 media-gfx/fontforge >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/desktop-file-utils app-arch/xz-utils X? ( x11-apps/mkfontdir media-fonts/encodings )
+DEPEND=>=kde-frameworks/extra-cmake-modules-5.11.0:5 media-gfx/fontforge >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/desktop-file-utils app-arch/xz-utils X? ( x11-apps/mkfontdir media-fonts/encodings )
 DESCRIPTION=Desktop/GUI font family for integrated use with the KDE desktop
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/oxygen-fonts
@@ -9,5 +9,5 @@ LICENSE=OFL-1.1
 RDEPEND=!media-fonts/oxygen-fonts
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/oxygen-fonts-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	font	b3239d2dc442d1717b9725e2be7cb5d6	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	font	b3239d2dc442d1717b9725e2be7cb5d6	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=4dc1ccff922d162b50d64d8308f02927
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.3.1 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.3.1
index 1c77a4a69271..0d39aa0e6fd4 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.3.1
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-plasma/baloo-5.3.1:5 >=kde-plasma/kwin-5.3.1:5 >=kde-plasma/plasma-workspace-5.3.1:5 >=kde-frameworks/attica-5.10.0:5 >=kde-frameworks/kactivities-5.10.0:5 >=kde-frameworks/karchive-5.10.0:5 >=kde-frameworks/kauth-5.10.0:5 >=kde-frameworks/kbookmarks-5.10.0:5 >=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/kcodecs-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdeclarative-5.10.0:5 >=kde-frameworks/kded-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/kemoticons-5.10.0:5 >=kde-frameworks/kglobalaccel-5.10.0:5 >=kde-frameworks/kguiaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kitemviews-5.10.0:5 >=kde-frameworks/kjobwidgets-5.10.0:5 >=kde-frameworks/knewstuff-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/knotifyconfig-5.10.0:5 >=kde-frameworks/kparts-5.10.0:5 >=kde-frameworks/kpeople-5.10.0:5 >=kde-frameworks/krunner-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwallet-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/plasma-5.10.0:5 >=kde-frameworks/solid-5.10.0:5 >=kde-frameworks/sonnet-5.10.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) touchpad? ( x11-drivers/xf86-input-synaptics ) usb? ( x11-libs/libXcursor x11-libs/libXfixes virtual/libusb:0 ) dev-libs/boost x11-proto/xproto fontconfig? ( x11-libs/libXrender ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 handbook? ( >=kde-frameworks/kdoctools-5.10.0:5 ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-plasma/baloo-5.3.1:5 >=kde-plasma/kwin-5.3.1:5 >=kde-plasma/plasma-workspace-5.3.1:5 >=kde-frameworks/attica-5.11.0:5 >=kde-frameworks/kactivities-5.11.0:5 >=kde-frameworks/karchive-5.11.0:5 >=kde-frameworks/kauth-5.11.0:5 >=kde-frameworks/kbookmarks-5.11.0:5 >=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/kcodecs-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdeclarative-5.11.0:5 >=kde-frameworks/kded-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/kemoticons-5.11.0:5 >=kde-frameworks/kglobalaccel-5.11.0:5 >=kde-frameworks/kguiaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kitemviews-5.11.0:5 >=kde-frameworks/kjobwidgets-5.11.0:5 >=kde-frameworks/knewstuff-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/knotifyconfig-5.11.0:5 >=kde-frameworks/kparts-5.11.0:5 >=kde-frameworks/kpeople-5.11.0:5 >=kde-frameworks/krunner-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwallet-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/plasma-5.11.0:5 >=kde-frameworks/solid-5.11.0:5 >=kde-frameworks/sonnet-5.11.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) touchpad? ( x11-drivers/xf86-input-synaptics ) usb? ( x11-libs/libXcursor x11-libs/libXfixes virtual/libusb:0 ) dev-libs/boost x11-proto/xproto fontconfig? ( x11-libs/libXrender ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 handbook? ( >=kde-frameworks/kdoctools-5.11.0:5 ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Plasma desktop
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=+fontconfig pulseaudio touchpad usb debug +handbook test
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-plasma/baloo-5.3.1:5 >=kde-plasma/kwin-5.3.1:5 >=kde-plasma/plasma-workspace-5.3.1:5 >=kde-frameworks/attica-5.10.0:5 >=kde-frameworks/kactivities-5.10.0:5 >=kde-frameworks/karchive-5.10.0:5 >=kde-frameworks/kauth-5.10.0:5 >=kde-frameworks/kbookmarks-5.10.0:5 >=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/kcodecs-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdeclarative-5.10.0:5 >=kde-frameworks/kded-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/kemoticons-5.10.0:5 >=kde-frameworks/kglobalaccel-5.10.0:5 >=kde-frameworks/kguiaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kitemviews-5.10.0:5 >=kde-frameworks/kjobwidgets-5.10.0:5 >=kde-frameworks/knewstuff-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/knotifyconfig-5.10.0:5 >=kde-frameworks/kparts-5.10.0:5 >=kde-frameworks/kpeople-5.10.0:5 >=kde-frameworks/krunner-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwallet-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/plasma-5.10.0:5 >=kde-frameworks/solid-5.10.0:5 >=kde-frameworks/sonnet-5.10.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) touchpad? ( x11-drivers/xf86-input-synaptics ) usb? ( x11-libs/libXcursor x11-libs/libXfixes virtual/libusb:0 ) >=kde-plasma/breeze-5.3.1:5 >=kde-plasma/kde-cli-tools-5.3.1:5 >=kde-plasma/kio-extras-5.3.1:5 >=kde-plasma/oxygen-5.3.1:5 sys-apps/accountsservice x11-apps/setxkbmap !kde-apps/kcontrol !kde-base/attica !kde-base/kcontrol !kde-base/kdepasswd !kde-base/knetattach[handbook] !kde-base/plasma-desktop !kde-base/plasma-workspace !kde-base/solid-actions-kcm !kde-base/systemsettings !kde-misc/kcm_touchpad !kde-misc/kcm-touchpad !kde-plasma/kcm-touchpad >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-plasma/baloo-5.3.1:5 >=kde-plasma/kwin-5.3.1:5 >=kde-plasma/plasma-workspace-5.3.1:5 >=kde-frameworks/attica-5.11.0:5 >=kde-frameworks/kactivities-5.11.0:5 >=kde-frameworks/karchive-5.11.0:5 >=kde-frameworks/kauth-5.11.0:5 >=kde-frameworks/kbookmarks-5.11.0:5 >=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/kcodecs-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdeclarative-5.11.0:5 >=kde-frameworks/kded-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/kemoticons-5.11.0:5 >=kde-frameworks/kglobalaccel-5.11.0:5 >=kde-frameworks/kguiaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kitemviews-5.11.0:5 >=kde-frameworks/kjobwidgets-5.11.0:5 >=kde-frameworks/knewstuff-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/knotifyconfig-5.11.0:5 >=kde-frameworks/kparts-5.11.0:5 >=kde-frameworks/kpeople-5.11.0:5 >=kde-frameworks/krunner-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwallet-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/plasma-5.11.0:5 >=kde-frameworks/solid-5.11.0:5 >=kde-frameworks/sonnet-5.11.0:5 dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] x11-libs/libX11 x11-libs/libxcb x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxkbfile fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) touchpad? ( x11-drivers/xf86-input-synaptics ) usb? ( x11-libs/libXcursor x11-libs/libXfixes virtual/libusb:0 ) >=kde-plasma/breeze-5.3.1:5 >=kde-plasma/kde-cli-tools-5.3.1:5 >=kde-plasma/kio-extras-5.3.1:5 >=kde-plasma/oxygen-5.3.1:5 sys-apps/accountsservice x11-apps/setxkbmap !kde-apps/kcontrol !kde-base/attica !kde-base/kcontrol !kde-base/kdepasswd !kde-base/knetattach[handbook] !kde-base/plasma-desktop !kde-base/plasma-workspace !kde-base/solid-actions-kcm !kde-base/systemsettings !kde-misc/kcm_touchpad !kde-misc/kcm-touchpad !kde-plasma/kcm-touchpad >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/plasma-desktop-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=109a9c3ed662d9a9e88dfddf828a12fa
diff --git a/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.3.1 b/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.3.1
index 612d044bbf12..0688a8f25ce1 100644
--- a/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.3.1
+++ b/metadata/md5-cache/kde-plasma/plasma-mediacenter-5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kguiaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/plasma-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( >=kde-plasma/baloo-5.3.1:5 >=kde-plasma/kfilemetadata-5.3.1:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kguiaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/plasma-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( >=kde-plasma/baloo-5.3.1:5 >=kde-plasma/kfilemetadata-5.3.1:5 ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Unified media experience for any device capable of running KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=semantic-desktop debug
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kguiaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/plasma-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( >=kde-plasma/baloo-5.3.1:5 >=kde-plasma/kfilemetadata-5.3.1:5 ) >=kde-plasma/plasma-workspace-5.3.1:5 dev-qt/qtmultimedia:5[qml] !media-video/plasma-mediacenter >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kguiaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/plasma-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 media-libs/taglib semantic-desktop? ( >=kde-plasma/baloo-5.3.1:5 >=kde-plasma/kfilemetadata-5.3.1:5 ) >=kde-plasma/plasma-workspace-5.3.1:5 dev-qt/qtmultimedia:5[qml] !media-video/plasma-mediacenter >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/plasma-mediacenter-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=3e90fa45c35e33045b6e2485a94fbbdb
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.3.1 b/metadata/md5-cache/kde-plasma/plasma-meta-5.3.1
index 58dda5b26608..0f9756358bbe 100644
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.3.1
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.3.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=metapackage
 RDEPEND=>=kde-plasma/baloo-5.3.1:5 >=kde-plasma/breeze-5.3.1:5 >=kde-plasma/kde-cli-tools-5.3.1:5 >=kde-plasma/kdecoration-5.3.1:5 >=kde-plasma/kfilemetadata-5.3.1:5 >=kde-plasma/khelpcenter-5.3.1:5 >=kde-plasma/khotkeys-5.3.1:5 >=kde-plasma/kinfocenter-5.3.1:5 >=kde-plasma/kio-extras-5.3.1:5 >=kde-plasma/kmenuedit-5.3.1:5 >=kde-plasma/kscreen-5.3.1:5 >=kde-plasma/ksshaskpass-5.3.1:5 >=kde-plasma/ksysguard-5.3.1:5 >=kde-plasma/kwayland-5.3.1:5 >=kde-plasma/kwin-5.3.1:5 >=kde-plasma/kwrited-5.3.1:5 >=kde-plasma/libkscreen-5.3.1:5 >=kde-plasma/milou-5.3.1:5 >=kde-plasma/oxygen-5.3.1:5 >=kde-plasma/oxygen-fonts-5.3.1:5 >=kde-plasma/plasma-desktop-5.3.1:5 >=kde-plasma/plasma-workspace-5.3.1:5 >=kde-plasma/polkit-kde-agent-5.3.1:5 >=kde-plasma/powerdevil-5.3.1:5 >=kde-plasma/systemsettings-5.3.1:5 bluetooth? ( >=kde-plasma/bluedevil-5.3.1:5 ) gtk? ( >=kde-plasma/kde-gtk-config-5.3.1:5 ) display-manager? ( sddm? ( x11-misc/sddm ) !sddm? ( x11-misc/lightdm ) ) networkmanager? ( >=kde-plasma/plasma-nm-5.3.1:5 ) sddm? ( >=kde-plasma/sddm-kcm-5.3.1:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.3.1:5 )
 SLOT=5
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0cf1a89daec72f09708a44bd09373896
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.3.1 b/metadata/md5-cache/kde-plasma/plasma-nm-5.3.1
index df909f37f6c8..13de66e1a7ee 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.3.1
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdeclarative-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kitemviews-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwallet-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/networkmanager-qt-5.10.0:5[teamd=] >=kde-frameworks/plasma-5.10.0:5 >=kde-frameworks/solid-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.10.0:5 dev-qt/qtxml:5 ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdeclarative-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kitemviews-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwallet-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/networkmanager-qt-5.11.0:5[teamd=] >=kde-frameworks/plasma-5.11.0:5 >=kde-frameworks/solid-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.11.0:5 dev-qt/qtxml:5 ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Plasma applet for NetworkManager
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=modemmanager openconnect teamd debug
 KEYWORDS=~amd64
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdeclarative-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kitemviews-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwallet-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/networkmanager-qt-5.10.0:5[teamd=] >=kde-frameworks/plasma-5.10.0:5 >=kde-frameworks/solid-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.10.0:5 dev-qt/qtxml:5 ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect ) !kde-base/plasma-nm !kde-misc/networkmanagement !kde-misc/plasma-nm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdeclarative-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kitemviews-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwallet-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/networkmanager-qt-5.11.0:5[teamd=] >=kde-frameworks/plasma-5.11.0:5 >=kde-frameworks/solid-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-misc/mobile-broadband-provider-info >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.11.0:5 dev-qt/qtxml:5 ) openconnect? ( dev-qt/qtxml:5 net-misc/networkmanager-openconnect net-misc/openconnect ) !kde-base/plasma-nm !kde-misc/networkmanagement !kde-misc/plasma-nm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/plasma-nm-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=e094d51f9b54e7499dd15f0d7c517192
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.3.1 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.3.1
index 303b939d3c0d..68eb2ddefbf0 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.3.1
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdeclarative-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kpackage-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/ktexteditor-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/plasma-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdeclarative-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kpackage-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/ktexteditor-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/plasma-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Useful applications for Plasma development
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=debug test
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdeclarative-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kpackage-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/ktexteditor-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/plasma-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 !dev-util/plasmate >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/karchive-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdeclarative-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kpackage-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/ktexteditor-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/plasma-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 !dev-util/plasmate >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/plasma-sdk-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=3467a471c3cd3de70f0e4d4ae4bbaf5a
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.3.1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.3.1
index 1fd35f79c87f..32ef81b55939 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.3.1
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.3.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-plasma/baloo-5.3.1:5 >=kde-plasma/kwayland-5.3.1:5 >=kde-plasma/kwin-5.3.1:5 >=kde-plasma/libkscreen-5.3.1:5 >=kde-plasma/libksysguard-5.3.1:5 >=kde-frameworks/kactivities-5.10.0:5 >=kde-frameworks/kauth-5.10.0:5 >=kde-frameworks/kbookmarks-5.10.0:5 >=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kcrash-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdeclarative-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/kdesu-5.10.0:5 >=kde-frameworks/kglobalaccel-5.10.0:5 >=kde-frameworks/kguiaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kidletime-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kitemviews-5.10.0:5 >=kde-frameworks/kjobwidgets-5.10.0:5 >=kde-frameworks/kjs-5.10.0:5 >=kde-frameworks/kjsembed-5.10.0:5 >=kde-frameworks/knewstuff-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/knotifyconfig-5.10.0:5 >=kde-frameworks/kpackage-5.10.0:5 >=kde-frameworks/krunner-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/ktexteditor-5.10.0:5 >=kde-frameworks/ktextwidgets-5.10.0:5 >=kde-frameworks/kwallet-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/kxmlrpcclient-5.10.0:5 >=kde-frameworks/networkmanager-qt-5.10.0:5 >=kde-frameworks/plasma-5.10.0:5 >=kde-frameworks/solid-5.10.0:5 dev-libs/wayland dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/pam sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/xcb-util-keysyms dbus? ( dev-libs/libdbusmenu-qt[qt5] ) drkonqi? ( >=kde-frameworks/kdewebkit-5.10.0:5 dev-qt/qtwebkit:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) systemmonitor? ( >=kde-plasma/libksysguard-5.3.1:5[processui] dev-qt/qtwebkit:5 ) x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 handbook? ( >=kde-frameworks/kdoctools-5.10.0:5 ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-plasma/baloo-5.3.1:5 >=kde-plasma/kwayland-5.3.1:5 >=kde-plasma/kwin-5.3.1:5 >=kde-plasma/libkscreen-5.3.1:5 >=kde-plasma/libksysguard-5.3.1:5 >=kde-frameworks/kactivities-5.11.0:5 >=kde-frameworks/kauth-5.11.0:5 >=kde-frameworks/kbookmarks-5.11.0:5 >=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kcrash-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdeclarative-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/kdesu-5.11.0:5 >=kde-frameworks/kglobalaccel-5.11.0:5 >=kde-frameworks/kguiaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kidletime-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kitemviews-5.11.0:5 >=kde-frameworks/kjobwidgets-5.11.0:5 >=kde-frameworks/kjs-5.11.0:5 >=kde-frameworks/kjsembed-5.11.0:5 >=kde-frameworks/knewstuff-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/knotifyconfig-5.11.0:5 >=kde-frameworks/kpackage-5.11.0:5 >=kde-frameworks/krunner-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/ktexteditor-5.11.0:5 >=kde-frameworks/ktextwidgets-5.11.0:5 >=kde-frameworks/kwallet-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/kxmlrpcclient-5.11.0:5 >=kde-frameworks/networkmanager-qt-5.11.0:5 >=kde-frameworks/plasma-5.11.0:5 >=kde-frameworks/solid-5.11.0:5 dev-libs/wayland dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/pam sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/xcb-util-keysyms dbus? ( dev-libs/libdbusmenu-qt[qt5] ) drkonqi? ( >=kde-frameworks/kdewebkit-5.11.0:5 dev-qt/qtwebkit:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) systemmonitor? ( >=kde-plasma/libksysguard-5.3.1:5[processui] dev-qt/qtwebkit:5 ) x11-proto/xproto >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 handbook? ( >=kde-frameworks/kdoctools-5.11.0:5 ) test? ( >=dev-qt/qttest-5.4.1:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE Plasma workspace
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=dbus +drkonqi gps prison qalculate +systemmonitor test debug +handbook test
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-plasma/baloo-5.3.1:5 >=kde-plasma/kwayland-5.3.1:5 >=kde-plasma/kwin-5.3.1:5 >=kde-plasma/libkscreen-5.3.1:5 >=kde-plasma/libksysguard-5.3.1:5 >=kde-frameworks/kactivities-5.10.0:5 >=kde-frameworks/kauth-5.10.0:5 >=kde-frameworks/kbookmarks-5.10.0:5 >=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kcrash-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdeclarative-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/kdesu-5.10.0:5 >=kde-frameworks/kglobalaccel-5.10.0:5 >=kde-frameworks/kguiaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kidletime-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kitemviews-5.10.0:5 >=kde-frameworks/kjobwidgets-5.10.0:5 >=kde-frameworks/kjs-5.10.0:5 >=kde-frameworks/kjsembed-5.10.0:5 >=kde-frameworks/knewstuff-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/knotifyconfig-5.10.0:5 >=kde-frameworks/kpackage-5.10.0:5 >=kde-frameworks/krunner-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/ktexteditor-5.10.0:5 >=kde-frameworks/ktextwidgets-5.10.0:5 >=kde-frameworks/kwallet-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/kxmlrpcclient-5.10.0:5 >=kde-frameworks/networkmanager-qt-5.10.0:5 >=kde-frameworks/plasma-5.10.0:5 >=kde-frameworks/solid-5.10.0:5 dev-libs/wayland dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/pam sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/xcb-util-keysyms dbus? ( dev-libs/libdbusmenu-qt[qt5] ) drkonqi? ( >=kde-frameworks/kdewebkit-5.10.0:5 dev-qt/qtwebkit:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) systemmonitor? ( >=kde-plasma/libksysguard-5.3.1:5[processui] dev-qt/qtwebkit:5 ) >=kde-frameworks/kded-5.10.0:5 >=kde-plasma/kde-cli-tools-5.3.1:5 >=kde-plasma/milou-5.3.1:5 dev-qt/qdbus:5 dev-qt/qtpaths:5 dev-qt/qtquickcontrols:5[widgets] kde-base/kdebase-pam x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !kde-base/freespacenotifier !kde-base/libtaskmanager !kde-base/kcminit !kde-base/kdebase-startkde !kde-base/klipper !kde-base/krunner !kde-base/ksmserver !kde-base/ksplash !kde-base/plasma-workspace >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-plasma/baloo-5.3.1:5 >=kde-plasma/kwayland-5.3.1:5 >=kde-plasma/kwin-5.3.1:5 >=kde-plasma/libkscreen-5.3.1:5 >=kde-plasma/libksysguard-5.3.1:5 >=kde-frameworks/kactivities-5.11.0:5 >=kde-frameworks/kauth-5.11.0:5 >=kde-frameworks/kbookmarks-5.11.0:5 >=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kcrash-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdeclarative-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/kdesu-5.11.0:5 >=kde-frameworks/kglobalaccel-5.11.0:5 >=kde-frameworks/kguiaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kidletime-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kitemviews-5.11.0:5 >=kde-frameworks/kjobwidgets-5.11.0:5 >=kde-frameworks/kjs-5.11.0:5 >=kde-frameworks/kjsembed-5.11.0:5 >=kde-frameworks/knewstuff-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/knotifyconfig-5.11.0:5 >=kde-frameworks/kpackage-5.11.0:5 >=kde-frameworks/krunner-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/ktexteditor-5.11.0:5 >=kde-frameworks/ktextwidgets-5.11.0:5 >=kde-frameworks/kwallet-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/kxmlrpcclient-5.11.0:5 >=kde-frameworks/networkmanager-qt-5.11.0:5 >=kde-frameworks/plasma-5.11.0:5 >=kde-frameworks/solid-5.11.0:5 dev-libs/wayland dev-qt/qtconcurrent:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5[jpeg] dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/phonon[qt5] sys-libs/pam sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/xcb-util-keysyms dbus? ( dev-libs/libdbusmenu-qt[qt5] ) drkonqi? ( >=kde-frameworks/kdewebkit-5.11.0:5 dev-qt/qtwebkit:5 ) gps? ( sci-geosciences/gpsd ) prison? ( media-libs/prison:5 ) qalculate? ( sci-libs/libqalculate ) systemmonitor? ( >=kde-plasma/libksysguard-5.3.1:5[processui] dev-qt/qtwebkit:5 ) >=kde-frameworks/kded-5.11.0:5 >=kde-plasma/kde-cli-tools-5.3.1:5 >=kde-plasma/milou-5.3.1:5 dev-qt/qdbus:5 dev-qt/qtpaths:5 dev-qt/qtquickcontrols:5[widgets] kde-base/kdebase-pam x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !kde-base/freespacenotifier !kde-base/libtaskmanager !kde-base/kcminit !kde-base/kdebase-startkde !kde-base/klipper !kde-base/krunner !kde-base/ksmserver !kde-base/ksplash !kde-base/plasma-workspace >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/plasma-workspace-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=430d0c6fde49f8376c7cbd69a4b3ca33
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.3.1 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.3.1
index 0e41e4347b7d..8a7f329e4769 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.3.1
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.3.1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=!kde-base/plasma-workspace-wallpapers >=kde-frameworks/extra-cmake-modules-5.10.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=!kde-base/plasma-workspace-wallpapers >=kde-frameworks/extra-cmake-modules-5.11.0:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Additional wallpapers for the Plasma workspace
 EAPI=5
 HOMEPAGE=http://www.kde.org/
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-base/plasma-workspace-wallpapers
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/plasma-workspace-wallpapers-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=8264c0717b675f85dd2d320cf5f343a5
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.3.1 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.3.1
index 868bfae92a27..3369b38124e4 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.3.1
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kcrash-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-qt-0.112.0[qt5] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kcrash-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-qt-0.112.0[qt5] >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=PolKit agent module for KDE
 EAPI=5
 HOMEPAGE=http://www.kde.org
 IUSE=debug
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kcrash-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-qt-0.112.0[qt5] !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kcrash-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-auth/polkit-qt-0.112.0[qt5] !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/polkit-kde-agent-1-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=c07352a968f27e6ed746650b2420c0fe
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.3.1 b/metadata/md5-cache/kde-plasma/powerdevil-5.3.1
index cb1955b36311..d9959e041131 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.3.1
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.10.0:5 >=kde-frameworks/kauth-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/kglobalaccel-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kidletime-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/knotifyconfig-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/solid-5.10.0:5 >=kde-plasma/libkscreen-5.3.1:5 >=kde-plasma/plasma-workspace-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 handbook? ( >=kde-frameworks/kdoctools-5.10.0:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.11.0:5 >=kde-frameworks/kauth-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/kglobalaccel-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kidletime-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/knotifyconfig-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/solid-5.11.0:5 >=kde-plasma/libkscreen-5.3.1:5 >=kde-plasma/plasma-workspace-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 handbook? ( >=kde-frameworks/kdoctools-5.11.0:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Power management for KDE Plasma Shell
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/powerdevil
 IUSE=debug +handbook
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.10.0:5 >=kde-frameworks/kauth-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/kglobalaccel-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kidletime-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/knotifyconfig-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/solid-5.10.0:5 >=kde-plasma/libkscreen-5.3.1:5 >=kde-plasma/plasma-workspace-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=kde-plasma/kde-cli-tools-5.3.1:5 || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) !kde-base/powerdevil >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.11.0:5 >=kde-frameworks/kauth-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/kglobalaccel-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kidletime-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/knotifyconfig-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/solid-5.11.0:5 >=kde-plasma/libkscreen-5.3.1:5 >=kde-plasma/plasma-workspace-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=kde-plasma/kde-cli-tools-5.3.1:5 || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) !kde-base/powerdevil >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/powerdevil-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=5221c1df112e949928c8a3701a33b49c
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.3.1-r1 b/metadata/md5-cache/kde-plasma/powerdevil-5.3.1-r1
index dd892ec6f235..09c58a0df167 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.3.1-r1
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.3.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.10.0:5 >=kde-frameworks/kauth-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/kglobalaccel-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kidletime-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/knotifyconfig-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/solid-5.10.0:5 >=kde-plasma/libkscreen-5.3.1:5 >=kde-plasma/plasma-workspace-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 handbook? ( >=kde-frameworks/kdoctools-5.10.0:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.11.0:5 >=kde-frameworks/kauth-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/kglobalaccel-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kidletime-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/knotifyconfig-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/solid-5.11.0:5 >=kde-plasma/libkscreen-5.3.1:5 >=kde-plasma/plasma-workspace-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 handbook? ( >=kde-frameworks/kdoctools-5.11.0:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=Power management for KDE Plasma Shell
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kde/workspace/powerdevil
 IUSE=systemd debug +handbook
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.10.0:5 >=kde-frameworks/kauth-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kdelibs4support-5.10.0:5 >=kde-frameworks/kglobalaccel-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kidletime-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/knotifyconfig-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/solid-5.10.0:5 >=kde-plasma/libkscreen-5.3.1:5 >=kde-plasma/plasma-workspace-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=kde-plasma/kde-cli-tools-5.3.1:5 || ( sys-power/upower-pm-utils >=sys-power/upower-0.9.23 ) !systemd? ( sys-auth/polkit-pkla-compat ) !kde-base/powerdevil >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.11.0:5 >=kde-frameworks/kauth-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kdelibs4support-5.11.0:5 >=kde-frameworks/kglobalaccel-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kidletime-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/knotifyconfig-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/solid-5.11.0:5 >=kde-plasma/libkscreen-5.3.1:5 >=kde-plasma/plasma-workspace-5.3.1:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 virtual/libudev:= x11-libs/libxcb >=kde-plasma/kde-cli-tools-5.3.1:5 || ( sys-power/upower-pm-utils >=sys-power/upower-0.9.23 ) !systemd? ( sys-auth/polkit-pkla-compat ) !kde-base/powerdevil >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/powerdevil-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=eedcaa29fb9b061a9c403214dfeb57eb
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.3.1 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.3.1
index c294bfa32132..2d7ee9d403bd 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.3.1
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE control module for SDDM
 EAPI=5
 HOMEPAGE=https://projects.kde.org/projects/kdereview/sddm-kcm
 IUSE=debug
 KEYWORDS=~amd64
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.3.1:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kauth-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 dev-qt/qtdeclarative:5[widgets] dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.3.1:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/sddm-kcm-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=dcaaf19197a63f009035f0425cdc63eb
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.3.1 b/metadata/md5-cache/kde-plasma/systemsettings-5.3.1
index 74e5cb723ea1..840665058867 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.3.1
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.10.0:5 >=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/khtml-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kitemviews-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 handbook? ( >=kde-frameworks/kdoctools-5.10.0:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kauth-5.11.0:5 >=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/khtml-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kitemviews-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 handbook? ( >=kde-frameworks/kdoctools-5.11.0:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=System settings utility
 EAPI=5
 HOMEPAGE=http://www.kde.org/
 IUSE=gtk debug +handbook
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kauth-5.10.0:5 >=kde-frameworks/kcmutils-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/khtml-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kitemviews-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 gtk? ( >=kde-plasma/kde-gtk-config-5.3.1:5 ) !kde-base/systemsettings >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kauth-5.11.0:5 >=kde-frameworks/kcmutils-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/khtml-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kitemviews-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 gtk? ( >=kde-plasma/kde-gtk-config-5.3.1:5 ) !kde-base/systemsettings >=kde-frameworks/kf-env-3 !kde-apps/kde4-l10n[-minimal] !kde-base/kde-l10n:4[-minimal(-)] >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.3.1/systemsettings-5.3.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=dc02c0c8b7c6ac9d62af569bc66345d7
diff --git a/metadata/md5-cache/mail-client/geary-0.8.2 b/metadata/md5-cache/mail-client/geary-0.10.0
similarity index 61%
rename from metadata/md5-cache/mail-client/geary-0.8.2
rename to metadata/md5-cache/mail-client/geary-0.10.0
index c325b94324e0..a1f8ee5bdac9 100644
--- a/metadata/md5-cache/mail-client/geary-0.8.2
+++ b/metadata/md5-cache/mail-client/geary-0.10.0
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=app-crypt/gcr-3.10.1[gtk,introspection,vala] app-crypt/libsecret dev-db/sqlite:3 dev-libs/glib:2 >=dev-libs/libgee-0.8.5:0.8 dev-libs/libxml2:2 dev-libs/gmime:2.6 media-libs/libcanberra >=net-libs/webkit-gtk-1.10.0:3[introspection] >=x11-libs/gtk+-3.10.0:3[introspection] x11-libs/libnotify app-text/gnome-doc-utils dev-util/desktop-file-utils nls? ( sys-devel/gettext ) || ( dev-lang/vala:0.28 dev-lang/vala:0.26 dev-lang/vala:0.24 dev-lang/vala:0.22 ) virtual/pkgconfig >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=app-crypt/gcr-3.10.1[gtk,introspection,vala] app-crypt/libsecret dev-db/sqlite:3 dev-libs/glib:2 >=dev-libs/libgee-0.8.5:0.8 dev-libs/libxml2:2 dev-libs/gmime:2.6 media-libs/libcanberra >=net-libs/webkit-gtk-1.10.0:3[introspection] >=x11-libs/gtk+-3.10.0:3[introspection] x11-libs/libnotify app-text/gnome-doc-utils dev-util/desktop-file-utils nls? ( sys-devel/gettext ) || ( dev-lang/vala:0.28 dev-lang/vala:0.26 dev-lang/vala:0.24 dev-lang/vala:0.22 ) virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
 DESCRIPTION=A lightweight, easy-to-use, feature-rich email client
 EAPI=5
-HOMEPAGE=http://www.yorba.org/projects/geary/
+HOMEPAGE=https://wiki.gnome.org/Apps/Geary
 IUSE=nls
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=app-crypt/gcr-3.10.1[gtk,introspection,vala] app-crypt/libsecret dev-db/sqlite:3 dev-libs/glib:2 >=dev-libs/libgee-0.8.5:0.8 dev-libs/libxml2:2 dev-libs/gmime:2.6 media-libs/libcanberra >=net-libs/webkit-gtk-1.10.0:3[introspection] >=x11-libs/gtk+-3.10.0:3[introspection] x11-libs/libnotify gnome-base/gsettings-desktop-schemas nls? ( virtual/libintl )
 SLOT=0
-SRC_URI=mirror://gnome/sources/geary/0.8/geary-0.8.2.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2
-_md5_=be59b643e6aee6477378489d80d639f8
+SRC_URI=mirror://gnome/sources/geary/0.10/geary-0.10.0.tar.xz
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=2aa276845b4f40a5e6ccdc3784849778
diff --git a/metadata/md5-cache/media-gfx/exiv2-0.24-r1 b/metadata/md5-cache/media-gfx/exiv2-0.24-r1
index 8a07148811c0..30b23dabeda4 100644
--- a/metadata/md5-cache/media-gfx/exiv2-0.24-r1
+++ b/metadata/md5-cache/media-gfx/exiv2-0.24-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=virtual/libiconv-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(-)?] nls? ( >=virtual/libintl-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(-)?] ) xmp? ( >=dev-libs/expat-2.1.0-r3[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(-)?] )
 SLOT=0/13
 SRC_URI=http://www.exiv2.org/exiv2-0.24.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=99bb21fea27d069cb86fac31e219786c
diff --git a/metadata/md5-cache/media-gfx/gmic-1.6.5.0 b/metadata/md5-cache/media-gfx/gmic-1.6.5.0
new file mode 100644
index 000000000000..bed732456a48
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/gmic-1.6.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare pretend
+DEPEND=fftw? ( sci-libs/fftw:3.0[threads] ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg? ( virtual/jpeg:0 ) opencv? ( >=media-libs/opencv-2.3.1a-r1 ) openexr? ( media-libs/ilmbase media-libs/openexr ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib )
+DESCRIPTION=GREYC's Magic Image Converter
+EAPI=5
+HOMEPAGE=http://gmic.eu/
+IUSE=ffmpeg fftw graphicsmagick jpeg opencv openexr openmp png tiff X zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=CeCILL-2 FDL-1.3
+RDEPEND=fftw? ( sci-libs/fftw:3.0[threads] ) graphicsmagick? ( media-gfx/graphicsmagick ) jpeg? ( virtual/jpeg:0 ) opencv? ( >=media-libs/opencv-2.3.1a-r1 ) openexr? ( media-libs/ilmbase media-libs/openexr ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) X? ( x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib ) ffmpeg? ( media-video/ffmpeg:0 )
+SLOT=0
+SRC_URI=http://gmic.eu/files/source/gmic_1.6.5.0.tar.gz
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=5210d993041670c3528b2bd5b9e6c6a7
diff --git a/metadata/md5-cache/media-gfx/graphite2-1.2.4-r1 b/metadata/md5-cache/media-gfx/graphite2-1.2.4-r1
index c86449ec2f2b..673eea80b1b6 100644
--- a/metadata/md5-cache/media-gfx/graphite2-1.2.4-r1
+++ b/metadata/md5-cache/media-gfx/graphite2-1.2.4-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=perl? ( dev-lang/perl:= )
 SLOT=0
 SRC_URI=mirror://sourceforge/silgraphite/graphite2/graphite2-1.2.4.tgz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
 _md5_=c1eccf4bee21c38c60c0ac022825523c
diff --git a/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r3 b/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r3
index 2c7c45bde416..347fd1c549bc 100644
--- a/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r3
+++ b/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r3
@@ -10,5 +10,5 @@ REQUIRED_USE=amd64? ( multilib? ( abi_x86_32 ) ) || ( abi_x86_32 abi_x86_64 )
 RESTRICT=strip
 SLOT=0
 SRC_URI=abi_x86_32? ( http://developer.download.nvidia.com/cg/Cg_3.1/Cg-3.1_April2012_x86.tgz ) abi_x86_64? ( http://developer.download.nvidia.com/cg/Cg_3.1/Cg-3.1_April2012_x86_64.tgz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=331d47b7598f4996ec55a566690d6211
diff --git a/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r4 b/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r4
index 7f329595f60d..bb7627aed2f1 100644
--- a/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r4
+++ b/metadata/md5-cache/media-gfx/nvidia-cg-toolkit-3.1.0013-r4
@@ -10,5 +10,5 @@ REQUIRED_USE=amd64? ( multilib? ( abi_x86_32 ) ) || ( abi_x86_32 abi_x86_64 )
 RESTRICT=strip
 SLOT=0
 SRC_URI=abi_x86_32? ( http://developer.download.nvidia.com/cg/Cg_3.1/Cg-3.1_April2012_x86.tgz ) abi_x86_64? ( http://developer.download.nvidia.com/cg/Cg_3.1/Cg-3.1_April2012_x86_64.tgz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eed665d81e2d970b357219ceaf1f1d59
diff --git a/metadata/md5-cache/media-gfx/potrace-1.12 b/metadata/md5-cache/media-gfx/potrace-1.12
index b8c86ee8a75d..2c3de99a2e2f 100644
--- a/metadata/md5-cache/media-gfx/potrace-1.12
+++ b/metadata/md5-cache/media-gfx/potrace-1.12
@@ -4,10 +4,10 @@ DESCRIPTION=Transforming bitmaps into vector graphics
 EAPI=5
 HOMEPAGE=http://potrace.sourceforge.net/
 IUSE=metric static-libs
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib
 SLOT=0
 SRC_URI=http://potrace.sourceforge.net/download/1.12/potrace-1.12.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=da3157d5c868129f6d4b97df45c51da6
+_md5_=5658799b9cd7a52832b1a60699606e8b
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.24-r5 b/metadata/md5-cache/media-gfx/sane-backends-1.0.24-r5
index f2a9f981b039..e185084d25cf 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.24-r5
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.24-r5
@@ -10,5 +10,5 @@ RDEPEND=sane_backends_dc210? ( >=virtual/jpeg-0-r2[abi_x86_32(-)?,abi_x86_64(-)?
 REQUIRED_USE=sane_backends_mustek_usb2? ( threads ) sane_backends_kvs40xx? ( threads )
 SLOT=0
 SRC_URI=https://alioth.debian.org/frs/download.php/file/3958/sane-backends-1.0.24.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=1fb1a9bcf2577167383a458807fede60
diff --git a/metadata/md5-cache/media-gfx/shotwell-0.22.0 b/metadata/md5-cache/media-gfx/shotwell-0.22.0
index d5aea6f166aa..a5451d69ec88 100644
--- a/metadata/md5-cache/media-gfx/shotwell-0.22.0
+++ b/metadata/md5-cache/media-gfx/shotwell-0.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=Open source photo manager for GNOME
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Shotwell
 IUSE=linguas_af linguas_ar linguas_as linguas_ast linguas_bg linguas_bn linguas_bn_IN linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_eu linguas_fi linguas_fr linguas_gd linguas_gl linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_ia linguas_id linguas_it linguas_ja linguas_kk linguas_km linguas_kn linguas_ko linguas_ky linguas_lt linguas_lv linguas_mk linguas_ml linguas_mr linguas_nb linguas_nl linguas_nn linguas_or linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_ta linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_HK linguas_zh_TW
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=app-text/gnome-doc-utils >=dev-db/sqlite-3.5.9:3 >=dev-libs/dbus-glib-0.80 >=dev-libs/glib-2.30.0:2 >=dev-libs/json-glib-0.7.6 >=dev-libs/libgee-0.8.5:0.8 >=dev-libs/libxml2-2.6.32:2 >=dev-util/desktop-file-utils-0.13 gnome-base/dconf >=media-libs/gexiv2-0.4.90 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 media-libs/gstreamer:1.0 media-libs/lcms:2 >=media-libs/libexif-0.6.16:= >=media-libs/libgphoto2-2.4.2:= >=media-libs/libraw-0.13.2:= >=net-libs/libsoup-2.26.0:2.4 >=net-libs/rest-0.7:0.7 >=net-libs/webkit-gtk-1.4:3 virtual/libgudev:=[introspection] >=x11-libs/gtk+-3.12.2:3[X]
 SLOT=0
 SRC_URI=mirror://gnome/sources/shotwell/0.22/shotwell-0.22.0.tar.xz http://pkgs.fedoraproject.org/cgit/shotwell.git/plain/shotwell.1 http://pkgs.fedoraproject.org/cgit/shotwell.git/plain/shotwell-icons.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7da2bfc70078542026524193cf62d75b
+_md5_=7c1378d93cab9914fa99f61c7447d050
diff --git a/metadata/md5-cache/media-gfx/ufraw-0.22 b/metadata/md5-cache/media-gfx/ufraw-0.22
new file mode 100644
index 000000000000..edce236be738
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/ufraw-0.22
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/glib:2= >=media-gfx/exiv2-0.11:0= media-libs/lcms:2= >=media-libs/lensfun-0.2.5:= media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= fits? ( sci-libs/cfitsio:0= ) gnome? ( >=gnome-base/gconf-2 ) gtk? ( >=x11-libs/gtk+-2.6:2 >=media-gfx/gtkimageview-1.5 ) gimp? ( >=media-gfx/gimp-2 ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DESCRIPTION=RAW Image format viewer and GIMP plugin
+EAPI=5
+HOMEPAGE=http://ufraw.sourceforge.net/
+IUSE=contrast fits gimp gnome gtk openmp timezone
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2= >=media-gfx/exiv2-0.11:0= media-libs/lcms:2= >=media-libs/lensfun-0.2.5:= media-libs/libpng:0= media-libs/tiff:0= virtual/jpeg:0= fits? ( sci-libs/cfitsio:0= ) gnome? ( >=gnome-base/gconf-2 ) gtk? ( >=x11-libs/gtk+-2.6:2 >=media-gfx/gtkimageview-1.5 ) gimp? ( >=media-gfx/gimp-2 )
+REQUIRED_USE=gimp? ( gtk )
+SLOT=0
+SRC_URI=mirror://sourceforge/ufraw/ufraw-0.22.tar.gz
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=c6f87b052c5d9f0201c43f0d414571dd
diff --git a/metadata/md5-cache/media-libs/a52dec-0.7.4-r7 b/metadata/md5-cache/media-libs/a52dec-0.7.4-r7
index 3373fe8d37fa..cb704a8d02af 100644
--- a/metadata/md5-cache/media-libs/a52dec-0.7.4-r7
+++ b/metadata/md5-cache/media-libs/a52dec-0.7.4-r7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=djbfft? ( >=sci-libs/djbfft-0.76-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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r8 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c09e1a28f37597378462d25be0ff096b
diff --git a/metadata/md5-cache/media-libs/aalib-1.4_rc5-r6 b/metadata/md5-cache/media-libs/aalib-1.4_rc5-r6
index e1facd14d4f7..602b93809757 100644
--- a/metadata/md5-cache/media-libs/aalib-1.4_rc5-r6
+++ b/metadata/md5-cache/media-libs/aalib-1.4_rc5-r6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=X? ( >=x11-libs/libX11-1.6.2[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(-)?] ) gpm? ( >=sys-libs/gpm-1.20.7-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(-)?] ) slang? ( >=sys-libs/slang-2.2.4-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(-)?] ) >=sys-libs/ncurses-5.9-r3[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
 SRC_URI=mirror://sourceforge/aa-project/aalib-1.4rc5.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=41b9b859d85d9fdf24c39836197512bb
diff --git a/metadata/md5-cache/media-libs/allegro-5.0.11 b/metadata/md5-cache/media-libs/allegro-5.0.11
index 9bbd510228a1..dbef139bb1ce 100644
--- a/metadata/md5-cache/media-libs/allegro-5.0.11
+++ b/metadata/md5-cache/media-libs/allegro-5.0.11
@@ -9,5 +9,5 @@ LICENSE=BSD ZLIB
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[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(-)?] ) dumb? ( >=media-libs/dumb-0.9.3-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(-)?] ) flac? ( >=media-libs/flac-1.2.1-r5[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(-)?] ) jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) openal? ( >=media-libs/openal-1.15.1[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(-)?] ) physfs? ( >=dev-games/physfs-2.0.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(-)?] ) png? ( >=media-libs/libpng-1.5.18: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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1[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(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.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(-)?] ) >=x11-libs/libXcursor-1.1.14[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(-)?] >=x11-libs/libXxf86vm-1.1.3[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(-)?] >=x11-libs/libXrandr-1.4.2[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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] gtk? ( >=x11-libs/gtk+-2.24.23:2[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(-)?] ) >=virtual/opengl-7.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(-)?] >=virtual/glu-9.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(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[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=5
 SRC_URI=mirror://sourceforge/alleg/allegro-5.0.11.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c14abfc0b649b416a5db90dc223dee59
diff --git a/metadata/md5-cache/media-libs/allegro-5.0.8-r1 b/metadata/md5-cache/media-libs/allegro-5.0.8-r1
index 7ec80dc05f4c..e278f1d047ad 100644
--- a/metadata/md5-cache/media-libs/allegro-5.0.8-r1
+++ b/metadata/md5-cache/media-libs/allegro-5.0.8-r1
@@ -9,5 +9,5 @@ LICENSE=BSD ZLIB
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[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(-)?] ) dumb? ( >=media-libs/dumb-0.9.3-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(-)?] ) flac? ( >=media-libs/flac-1.2.1-r5[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(-)?] ) jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) openal? ( >=media-libs/openal-1.15.1[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(-)?] ) physfs? ( >=dev-games/physfs-2.0.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(-)?] ) png? ( >=media-libs/libpng-1.5.18: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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1[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(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.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(-)?] ) >=x11-libs/libXcursor-1.1.14[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(-)?] >=x11-libs/libXxf86vm-1.1.3[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(-)?] >=x11-libs/libXrandr-1.4.2[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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] gtk? ( >=x11-libs/gtk+-2.24.23:2[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(-)?] ) >=virtual/opengl-7.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(-)?] >=virtual/glu-9.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(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[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=5
 SRC_URI=mirror://sourceforge/alleg/allegro-5.0.8.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=77af082347ba8fdf9d720907b71568ed
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.0.27.2 b/metadata/md5-cache/media-libs/alsa-lib-1.0.27.2
index ea23536f7e17..b5866fb3558a 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.0.27.2
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.0.27.2
@@ -10,5 +10,5 @@ RDEPEND=python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[pyth
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://alsaproject/lib/alsa-lib-1.0.27.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d707846245e569387474175338995baf
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.0.28 b/metadata/md5-cache/media-libs/alsa-lib-1.0.28
index 4d48b1805bdd..817a357fba45 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.0.28
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.0.28
@@ -10,5 +10,5 @@ RDEPEND=python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[pyth
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://alsaproject/lib/alsa-lib-1.0.28.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=82f11dcdfadb8e9d772735ddb4ef1b4e
diff --git a/metadata/md5-cache/media-libs/alsa-lib-1.0.29 b/metadata/md5-cache/media-libs/alsa-lib-1.0.29
index 2ae9e6dfbb3b..130564d549f7 100644
--- a/metadata/md5-cache/media-libs/alsa-lib-1.0.29
+++ b/metadata/md5-cache/media-libs/alsa-lib-1.0.29
@@ -10,5 +10,5 @@ RDEPEND=python? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[pyth
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://alsaproject/lib/alsa-lib-1.0.29.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ec9cc8ce8c9523ce2b70400b4dc1d0a6
diff --git a/metadata/md5-cache/media-libs/alsa-oss-1.0.25-r1 b/metadata/md5-cache/media-libs/alsa-oss-1.0.25-r1
index 94a54d6add69..64d9999fa006 100644
--- a/metadata/md5-cache/media-libs/alsa-oss-1.0.25-r1
+++ b/metadata/md5-cache/media-libs/alsa-oss-1.0.25-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.0.25[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-soundlibs-20140406-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32] )
 SLOT=0
 SRC_URI=mirror://alsaproject/oss-lib/alsa-oss-1.0.25.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=28cddb44c5a0f7595afc728db1c751c0
diff --git a/metadata/md5-cache/media-libs/alsa-oss-1.0.28 b/metadata/md5-cache/media-libs/alsa-oss-1.0.28
index f3cc68b79fb6..f77094ef7e68 100644
--- a/metadata/md5-cache/media-libs/alsa-oss-1.0.28
+++ b/metadata/md5-cache/media-libs/alsa-oss-1.0.28
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/alsa-lib-1.0.28[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-soundlibs-20140406-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32] )
 SLOT=0
 SRC_URI=mirror://alsaproject/oss-lib/alsa-oss-1.0.28.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7cc3f9e48cb86f285fb7ba7a26355295
diff --git a/metadata/md5-cache/media-libs/audiofile-0.3.6-r1 b/metadata/md5-cache/media-libs/audiofile-0.3.6-r1
index 88a44a21f310..831fc570e9fb 100644
--- a/metadata/md5-cache/media-libs/audiofile-0.3.6-r1
+++ b/metadata/md5-cache/media-libs/audiofile-0.3.6-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=flac? ( >=media-libs/flac-1.2.1[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-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0/1
 SRC_URI=mirror://gnome/sources/audiofile/0.3/audiofile-0.3.6.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=52a5d323eb2f2f4260da2389f870705f
diff --git a/metadata/md5-cache/media-libs/celt-0.11.1-r1 b/metadata/md5-cache/media-libs/celt-0.11.1-r1
index 90fe3f533b9f..c6960a01d52e 100644
--- a/metadata/md5-cache/media-libs/celt-0.11.1-r1
+++ b/metadata/md5-cache/media-libs/celt-0.11.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=ogg? ( media-libs/libogg )
 SLOT=0
 SRC_URI=http://downloads.us.xiph.org/releases/celt/celt-0.11.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d4352ee28ecec57a6f84b3f98208feda
diff --git a/metadata/md5-cache/media-libs/dumb-0.9.3-r3 b/metadata/md5-cache/media-libs/dumb-0.9.3-r3
index 4d162d788372..18a383a47cc2 100644
--- a/metadata/md5-cache/media-libs/dumb-0.9.3-r3
+++ b/metadata/md5-cache/media-libs/dumb-0.9.3-r3
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
 LICENSE=DUMB-0.9.2
 SLOT=0
 SRC_URI=mirror://sourceforge/dumb/dumb-0.9.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0747875bbc4cf30d7930513edf4988e4
diff --git a/metadata/md5-cache/media-libs/faac-1.28-r4 b/metadata/md5-cache/media-libs/faac-1.28-r4
index 2e6508481b33..783716730f2e 100644
--- a/metadata/md5-cache/media-libs/faac-1.28-r4
+++ b/metadata/md5-cache/media-libs/faac-1.28-r4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MPEG-4
 RDEPEND=media-libs/libmp4v2:0= abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r1 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/faac/faac-1.28.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ec9d4da7bf4618df90fe03e56a1be43f
diff --git a/metadata/md5-cache/media-libs/faad2-2.7-r3 b/metadata/md5-cache/media-libs/faad2-2.7-r3
index 519688703a7e..4002c1db197e 100644
--- a/metadata/md5-cache/media-libs/faad2-2.7-r3
+++ b/metadata/md5-cache/media-libs/faad2-2.7-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r1 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/faac/faad2-2.7.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0bb42ef8bad13e727823dfd6877aef60
diff --git a/metadata/md5-cache/media-libs/fdk-aac-0.1.2 b/metadata/md5-cache/media-libs/fdk-aac-0.1.2
index 0bc415a72b29..cda668ccdf1b 100644
--- a/metadata/md5-cache/media-libs/fdk-aac-0.1.2
+++ b/metadata/md5-cache/media-libs/fdk-aac-0.1.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
 LICENSE=FraunhoferFDK
 SLOT=0
 SRC_URI=mirror://sourceforge/opencore-amr/fdk-aac-0.1.2.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=771f4104c660f7f86d31de6ad3ec61ad
diff --git a/metadata/md5-cache/media-libs/fdk-aac-0.1.3 b/metadata/md5-cache/media-libs/fdk-aac-0.1.3
index a187dca9590c..99092d3e76a7 100644
--- a/metadata/md5-cache/media-libs/fdk-aac-0.1.3
+++ b/metadata/md5-cache/media-libs/fdk-aac-0.1.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
 LICENSE=FraunhoferFDK
 SLOT=0
 SRC_URI=mirror://sourceforge/opencore-amr/fdk-aac-0.1.3.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=800420cc66dc5eef2c09bb16e9259ed7
diff --git a/metadata/md5-cache/media-libs/fdk-aac-0.1.4 b/metadata/md5-cache/media-libs/fdk-aac-0.1.4
index 099dcc358551..f73f27ac8fea 100644
--- a/metadata/md5-cache/media-libs/fdk-aac-0.1.4
+++ b/metadata/md5-cache/media-libs/fdk-aac-0.1.4
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos
 LICENSE=FraunhoferFDK
 SLOT=0/1
 SRC_URI=mirror://sourceforge/opencore-amr/fdk-aac-0.1.4.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=07a6a085c4195ec80a5f286b3ed52528
diff --git a/metadata/md5-cache/media-libs/ffmpegsource-2.20 b/metadata/md5-cache/media-libs/ffmpegsource-2.20
index 7d03e8a28b56..0e6aa15d20b8 100644
--- a/metadata/md5-cache/media-libs/ffmpegsource-2.20
+++ b/metadata/md5-cache/media-libs/ffmpegsource-2.20
@@ -4,10 +4,10 @@ DESCRIPTION=A libav/ffmpeg based source library for easy frame accurate access
 EAPI=5
 HOMEPAGE=https://github.com/FFMS/ffms2
 IUSE=libav static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=MIT
 RDEPEND=sys-libs/zlib libav? ( >=media-video/libav-9.17:0= ) !libav? ( >=media-video/ffmpeg-1.2.6-r1:0= )
 SLOT=0/3
 SRC_URI=https://github.com/FFMS/ffms2/archive/2.20.tar.gz -> ffmpegsource-2.20.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=c87259c5783f17cffd142a5bbc1c32c5
+_md5_=a23a5be4610a75abe6cc55863861fd52
diff --git a/metadata/md5-cache/media-libs/flac-1.3.1-r1 b/metadata/md5-cache/media-libs/flac-1.3.1-r1
index faffa9008ffe..a04a4c2c5a69 100644
--- a/metadata/md5-cache/media-libs/flac-1.3.1-r1
+++ b/metadata/md5-cache/media-libs/flac-1.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD FDL-1.2 GPL-2 LGPL-2.1
 RDEPEND=ogg? ( >=media-libs/libogg-1.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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/flac/flac-1.3.1.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=fc0178ab2384d2aba7e9973e06e19991
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.11.1-r2 b/metadata/md5-cache/media-libs/fontconfig-2.11.1-r2
index 3e9e7140116b..ddece3eaad4e 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.11.1-r2
+++ b/metadata/md5-cache/media-libs/fontconfig-2.11.1-r2
@@ -10,5 +10,5 @@ PDEPEND=!x86-winnt? ( app-eselect/eselect-fontconfig ) virtual/ttf-fonts
 RDEPEND=>=dev-libs/expat-2.1.0-r3[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(-)?] >=media-libs/freetype-2.5.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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.11.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f3adf74d3d2e11f63b71dd5c93253d8f
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.11.93 b/metadata/md5-cache/media-libs/fontconfig-2.11.93
index a4c3fa49afee..14110bf35b64 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.11.93
+++ b/metadata/md5-cache/media-libs/fontconfig-2.11.93
@@ -10,5 +10,5 @@ PDEPEND=!x86-winnt? ( app-eselect/eselect-fontconfig ) virtual/ttf-fonts
 RDEPEND=>=dev-libs/expat-2.1.0-r3[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(-)?] >=media-libs/freetype-2.5.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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.11.93.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6b26486b0d6bb8cc48c0b3ab455bbae7
diff --git a/metadata/md5-cache/media-libs/fontconfig-2.11.94 b/metadata/md5-cache/media-libs/fontconfig-2.11.94
index d7531a85350b..7af636b9370c 100644
--- a/metadata/md5-cache/media-libs/fontconfig-2.11.94
+++ b/metadata/md5-cache/media-libs/fontconfig-2.11.94
@@ -10,5 +10,5 @@ PDEPEND=!x86-winnt? ( app-eselect/eselect-fontconfig ) virtual/ttf-fonts
 RDEPEND=>=dev-libs/expat-2.1.0-r3[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(-)?] >=media-libs/freetype-2.5.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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=1.0
 SRC_URI=http://fontconfig.org/release/fontconfig-2.11.94.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e28b29a1953f5fb751e38707cd50aeac
diff --git a/metadata/md5-cache/media-libs/freealut-1.1.0-r3 b/metadata/md5-cache/media-libs/freealut-1.1.0-r3
index f9d052748f9d..3336f983dad1 100644
--- a/metadata/md5-cache/media-libs/freealut-1.1.0-r3
+++ b/metadata/md5-cache/media-libs/freealut-1.1.0-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-sdl-20140406 ) >=media-libs/openal-1.15.1[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
 SRC_URI=http://connect.creativelabs.com/openal/Downloads/ALUT/freealut-1.1.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=98f28e39f6cc572994ce27ce2bb5b63e
diff --git a/metadata/md5-cache/media-libs/freeglut-2.8.1-r1 b/metadata/md5-cache/media-libs/freeglut-2.8.1-r1
index 1e74e3185095..62e5792241f1 100644
--- a/metadata/md5-cache/media-libs/freeglut-2.8.1-r1
+++ b/metadata/md5-cache/media-libs/freeglut-2.8.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/glu-9.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(-)?] >=virtual/opengl-7.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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXi-1.7.2[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(-)?] >=x11-libs/libXrandr-1.4.2[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(-)?] >=x11-libs/libXxf86vm-1.1.3[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-opengl[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/freeglut/freeglut-2.8.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=bf71ebe85c94e63ebf9e3d1eea512958
diff --git a/metadata/md5-cache/media-libs/freeglut-3.0.0 b/metadata/md5-cache/media-libs/freeglut-3.0.0
index 48a2285a2ae1..4fb8cb2f27a5 100644
--- a/metadata/md5-cache/media-libs/freeglut-3.0.0
+++ b/metadata/md5-cache/media-libs/freeglut-3.0.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=virtual/glu-9.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(-)?] >=virtual/opengl-7.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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXi-1.7.2[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(-)?] >=x11-libs/libXrandr-1.4.2[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(-)?] >=x11-libs/libXxf86vm-1.1.3[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-opengl[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/freeglut/freeglut-3.0.0.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6febec29c4fafa0dc2573c30d7a6a038
diff --git a/metadata/md5-cache/media-libs/freetype-2.5.5 b/metadata/md5-cache/media-libs/freetype-2.5.5
index 2e5fda217816..f5cd29e20988 100644
--- a/metadata/md5-cache/media-libs/freetype-2.5.5
+++ b/metadata/md5-cache/media-libs/freetype-2.5.5
@@ -12,5 +12,5 @@ REQUIRED_USE=harfbuzz? ( auto-hinter )
 RESTRICT=!bindist? ( bindist )
 SLOT=2
 SRC_URI=mirror://sourceforge/freetype/freetype-2.5.5.tar.bz2 mirror://nongnu/freetype/freetype-2.5.5.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.5.5.tar.bz2 mirror://nongnu/freetype/ft2demos-2.5.5.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.5.5.tar.bz2 mirror://nongnu/freetype/freetype-doc-2.5.5.tar.bz2 ) infinality? ( http://dev.gentoo.org/~polynomial-c/freetype-2.5.5-infinality-patches.tar.xz )
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c63c7816fb2cacda015e53f773d7310a
diff --git a/metadata/md5-cache/media-libs/freetype-2.6 b/metadata/md5-cache/media-libs/freetype-2.6
index 33e917fbf3dc..4eef1c49771c 100644
--- a/metadata/md5-cache/media-libs/freetype-2.6
+++ b/metadata/md5-cache/media-libs/freetype-2.6
@@ -11,5 +11,5 @@ RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=!bindist? ( bindist )
 SLOT=2
 SRC_URI=mirror://sourceforge/freetype/freetype-2.6.tar.bz2 mirror://nongnu/freetype/freetype-2.6.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.6.tar.bz2 mirror://nongnu/freetype/ft2demos-2.6.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.6.tar.bz2 mirror://nongnu/freetype/freetype-doc-2.6.tar.bz2 ) infinality? ( http://dev.gentoo.org/~polynomial-c/freetype-2.6-infinality-patches.tar.xz )
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0ece8d5f5ad3a3ac56011fdb6c47c064
diff --git a/metadata/md5-cache/media-libs/game-music-emu-0.6.0-r1 b/metadata/md5-cache/media-libs/game-music-emu-0.6.0-r1
index 3c74cec38f43..9e54ab2e4f33 100644
--- a/metadata/md5-cache/media-libs/game-music-emu-0.6.0-r1
+++ b/metadata/md5-cache/media-libs/game-music-emu-0.6.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://game-music-emu.googlecode.com/files/game-music-emu-0.6.0.tar.bz2
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=64ae5c7bd4e98334e4d25e52b4683ed2
diff --git a/metadata/md5-cache/media-libs/gavl-1.4.0-r1 b/metadata/md5-cache/media-libs/gavl-1.4.0-r1
index 9edca65b99fa..e59d11f9e4bc 100644
--- a/metadata/md5-cache/media-libs/gavl-1.4.0-r1
+++ b/metadata/md5-cache/media-libs/gavl-1.4.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 hppa ppc ~ppc64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://sourceforge/gmerlin/gavl-1.4.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=24762ccd51aa27102e1197e7ba09a518
diff --git a/metadata/md5-cache/media-libs/gd-2.0.35-r4 b/metadata/md5-cache/media-libs/gd-2.0.35-r4
index b8e45b84389d..e0de5f153fe3 100644
--- a/metadata/md5-cache/media-libs/gd-2.0.35-r4
+++ b/metadata/md5-cache/media-libs/gd-2.0.35-r4
@@ -10,5 +10,5 @@ RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(
 REQUIRED_USE=prefix? ( fontconfig )
 SLOT=2
 SRC_URI=http://libgd.org/releases/gd-2.0.35.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1277e905d1b820ef3b0161c2c4a815a5
diff --git a/metadata/md5-cache/media-libs/gd-2.1.1 b/metadata/md5-cache/media-libs/gd-2.1.1
index 179496c38a67..87e3ad71b839 100644
--- a/metadata/md5-cache/media-libs/gd-2.1.1
+++ b/metadata/md5-cache/media-libs/gd-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(
 REQUIRED_USE=prefix? ( fontconfig )
 SLOT=2/3
 SRC_URI=mirror://bitbucket/libgd/gd-libgd/downloads/libgd-2.1.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2f931b0d15aa0019e978c3dab7420135
diff --git a/metadata/md5-cache/media-libs/gd-2.1.1-r1 b/metadata/md5-cache/media-libs/gd-2.1.1-r1
index d211eaad2031..358c9d59a44c 100644
--- a/metadata/md5-cache/media-libs/gd-2.1.1-r1
+++ b/metadata/md5-cache/media-libs/gd-2.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(
 REQUIRED_USE=prefix? ( fontconfig )
 SLOT=2/3
 SRC_URI=mirror://bitbucket/libgd/gd-libgd/downloads/libgd-2.1.1.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4fa4e50d5d53826e3f7804449a25f4c4
diff --git a/metadata/md5-cache/media-libs/gexiv2-0.10.3 b/metadata/md5-cache/media-libs/gexiv2-0.10.3
new file mode 100644
index 000000000000..093256889881
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gexiv2-0.10.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=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-libs/glib-2.26.1:2 >=media-gfx/exiv2-0.21:0= introspection? ( dev-libs/gobject-introspection ) virtual/pkgconfig
+DESCRIPTION=GObject-based wrapper around the Exiv2 library
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Projects/gexiv2
+IUSE=introspection python static-libs python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+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(-)] >=dev-libs/glib-2.26.1:2 >=media-gfx/exiv2-0.21:0= introspection? ( dev-libs/gobject-introspection )
+REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 ) )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gexiv2/0.10/gexiv2-0.10.3.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=fefffbc0bbe276e355b50149eea73128
diff --git a/metadata/md5-cache/media-libs/giflib-4.1.6-r3 b/metadata/md5-cache/media-libs/giflib-4.1.6-r3
index 981f84bf1ade..b4d098dec63e 100644
--- a/metadata/md5-cache/media-libs/giflib-4.1.6-r3
+++ b/metadata/md5-cache/media-libs/giflib-4.1.6-r3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=rle? ( media-libs/urt ) X? ( >=x11-libs/libX11-1.6.2[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-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 SLOT=0
 SRC_URI=mirror://sourceforge/giflib/giflib-4.1.6.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=308d3963c08f24025a72f96935b9b24f
diff --git a/metadata/md5-cache/media-libs/giflib-4.2.3-r1 b/metadata/md5-cache/media-libs/giflib-4.2.3-r1
index 88be4e879539..fe3101bfa9a3 100644
--- a/metadata/md5-cache/media-libs/giflib-4.2.3-r1
+++ b/metadata/md5-cache/media-libs/giflib-4.2.3-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=X? ( >=x11-libs/libX11-1.6.2[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-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 SLOT=0
 SRC_URI=mirror://sourceforge/giflib/giflib-4.2.3.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e5e651ece5c3b51d387aa2fb457b3427
diff --git a/metadata/md5-cache/media-libs/giflib-5.0.6 b/metadata/md5-cache/media-libs/giflib-5.0.6
index 3c7b016176b9..561ebc93366f 100644
--- a/metadata/md5-cache/media-libs/giflib-5.0.6
+++ b/metadata/md5-cache/media-libs/giflib-5.0.6
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 SLOT=0/6
 SRC_URI=mirror://sourceforge/giflib/giflib-5.0.6.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7badea189d373c7eab88fc49a6a23c34
diff --git a/metadata/md5-cache/media-libs/giflib-5.1.0 b/metadata/md5-cache/media-libs/giflib-5.1.0
index 771800e39ed5..c5e8c6513980 100644
--- a/metadata/md5-cache/media-libs/giflib-5.1.0
+++ b/metadata/md5-cache/media-libs/giflib-5.1.0
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 SLOT=0/7
 SRC_URI=mirror://sourceforge/giflib/giflib-5.1.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=57287b27a50c4eb35090834a4825b425
diff --git a/metadata/md5-cache/media-libs/giflib-5.1.1 b/metadata/md5-cache/media-libs/giflib-5.1.1
index fb139b345413..903f9ee58878 100644
--- a/metadata/md5-cache/media-libs/giflib-5.1.1
+++ b/metadata/md5-cache/media-libs/giflib-5.1.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 SLOT=0/7
 SRC_URI=mirror://sourceforge/giflib/giflib-5.1.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ca894e2a35dbe10812fa1d225924f4f2
diff --git a/metadata/md5-cache/media-libs/glew-1.10.0-r2 b/metadata/md5-cache/media-libs/glew-1.10.0-r2
index 20ccb4bb6af6..6dec1b06ed82 100644
--- a/metadata/md5-cache/media-libs/glew-1.10.0-r2
+++ b/metadata/md5-cache/media-libs/glew-1.10.0-r2
@@ -9,5 +9,5 @@ LICENSE=BSD MIT
 RDEPEND=>=virtual/glu-9.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(-)?] >=virtual/opengl-7.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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXi-1.7.2[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(-)?] >=x11-libs/libXmu-1.1.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
 SLOT=0/1.10
 SRC_URI=mirror://sourceforge/glew/glew-1.10.0.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=53fb2f124d03028e4c2c796f1054cfba
diff --git a/metadata/md5-cache/media-libs/glew-1.11.0 b/metadata/md5-cache/media-libs/glew-1.11.0
index 6d334330b53f..4f1b9423c136 100644
--- a/metadata/md5-cache/media-libs/glew-1.11.0
+++ b/metadata/md5-cache/media-libs/glew-1.11.0
@@ -9,5 +9,5 @@ LICENSE=BSD MIT
 RDEPEND=>=virtual/glu-9.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(-)?] >=virtual/opengl-7.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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXi-1.7.2[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(-)?] >=x11-libs/libXmu-1.1.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
 SLOT=0/1.11
 SRC_URI=mirror://sourceforge/glew/glew-1.11.0.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0e8b0561a76dc48b7708fed5c471abe1
diff --git a/metadata/md5-cache/media-libs/glew-1.12.0 b/metadata/md5-cache/media-libs/glew-1.12.0
index 6b4cccdb86ea..94ea9ccc15d8 100644
--- a/metadata/md5-cache/media-libs/glew-1.12.0
+++ b/metadata/md5-cache/media-libs/glew-1.12.0
@@ -9,5 +9,5 @@ LICENSE=BSD MIT
 RDEPEND=>=virtual/glu-9.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(-)?] >=virtual/opengl-7.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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXi-1.7.2[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(-)?] >=x11-libs/libXmu-1.1.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
 SLOT=0/1.12
 SRC_URI=mirror://sourceforge/glew/glew-1.12.0.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8f41e155d60142e18aa27678638f7609
diff --git a/metadata/md5-cache/media-libs/glpng-1.46-r1 b/metadata/md5-cache/media-libs/glpng-1.46-r1
index 83d0479cdcf5..e7932af14a44 100644
--- a/metadata/md5-cache/media-libs/glpng-1.46-r1
+++ b/metadata/md5-cache/media-libs/glpng-1.46-r1
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=virtual/opengl[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(-)?] virtual/glu[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(-)?] media-libs/libpng: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(-)?] sys-libs/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(-)?]
 SLOT=0
 SRC_URI=http://repo.or.cz/w/glpng.git/snapshot/v1.46.tar.gz -> glpng-1.46.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a36d59b575fb04edac3c7ad106bdb088
diff --git a/metadata/md5-cache/media-libs/glu-9.0.0-r1 b/metadata/md5-cache/media-libs/glu-9.0.0-r1
index 18a0ab4b81ae..6a8e51fb4b5f 100644
--- a/metadata/md5-cache/media-libs/glu-9.0.0-r1
+++ b/metadata/md5-cache/media-libs/glu-9.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=SGI-B-2.0
 RDEPEND=>=virtual/opengl-7.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(-)?] !<media-libs/mesa-9 abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/glu/glu-9.0.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2d87eca1b6a9ce404a3aa5096a9e1668
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.23-r2 b/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.23-r2
index aac10aac835b..37f009ba4231 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.23-r2
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-0.10.23-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] >=media-libs/gst-plugins-base-0.10.36:0.10[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(-)?] >=media-libs/gstreamer-0.10.36:0.10[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(-)?] orc? ( >=dev-lang/orc-0.4.17[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(-)?] ) !<media-plugins/gst-plugins-farsight-0.12.11:0.10 >=dev-libs/glib-2.38.2-r1:2[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(-)?] >=media-libs/gstreamer-0.10.36-r2:0.10[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-gstplugins[-abi_x86_32(-)] )
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz http://dev.gentoo.org/~tetromino/distfiles/gst-plugins-bad/gst-plugins-bad-0.10.23-h264-patches.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d5f26a72b763441129df3c08251cc537
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-1.2.4-r1 b/metadata/md5-cache/media-libs/gst-plugins-bad-1.2.4-r1
index df4750016a7d..17e3838b1cb2 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-1.2.4-r1
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-1.2.4-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] >=media-libs/gst-plugins-base-1.2:1.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(-)?] >=media-libs/gstreamer-1.2:1.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(-)?] egl? ( >=media-libs/mesa-9.1.6[egl,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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) orc? ( >=dev-lang/orc-0.4.17[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(-)?] ) !<media-libs/gst-plugins-good-1.1:1.0 >=dev-libs/glib-2.38.2-r1:2[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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?]
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=90abcbc4e76882bef04c690cae04d454
diff --git a/metadata/md5-cache/media-libs/gst-plugins-bad-1.4.5 b/metadata/md5-cache/media-libs/gst-plugins-bad-1.4.5
index e1aeb84fbd46..0ac703233b3c 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-bad-1.4.5
+++ b/metadata/md5-cache/media-libs/gst-plugins-bad-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=egl? ( !gles2 ) gles2? ( !egl !opengl ) opengl? ( X ) wayland? ( egl )
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2d625d743ce6f34b437e200729280427
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-0.10.36-r1 b/metadata/md5-cache/media-libs/gst-plugins-base-0.10.36-r1
index 1ae5ba9ee7f8..20d27c958fbf 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-0.10.36-r1
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-0.10.36-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=media-libs/gstreamer-0.10.36:0.10[introspection?,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(-)?] >=dev-libs/libxml2-2.9.1-r4:2[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(-)?] >=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(-)?] app-text/iso-codes introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) orc? ( >=dev-lang/orc-0.4.17[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(-)?] ) !<media-libs/gst-plugins-bad-0.10.10:0.10 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r5 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) >=dev-libs/glib-2.38.2-r1:2[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(-)?] >=media-libs/gstreamer-0.10.36-r2:0.10[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-gstplugins[-abi_x86_32(-)] )
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=869af8ebbc4b636138580e145c484c2d
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-0.10.36-r2 b/metadata/md5-cache/media-libs/gst-plugins-base-0.10.36-r2
index 341ccb44441e..4d0e1d304a5e 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-0.10.36-r2
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-0.10.36-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=media-libs/gstreamer-0.10.36:0.10[introspection?,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(-)?] >=dev-libs/libxml2-2.9.1-r4:2[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(-)?] >=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(-)?] app-text/iso-codes introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) orc? ( >=dev-lang/orc-0.4.17[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(-)?] ) !<media-libs/gst-plugins-bad-0.10.10:0.10 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r5 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) >=dev-libs/glib-2.38.2-r1:2[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(-)?] >=media-libs/gstreamer-0.10.36-r2:0.10[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-gstplugins[-abi_x86_32(-)] )
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ea4b282a1a67d94b548123f228c2df45
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.2.4-r1 b/metadata/md5-cache/media-libs/gst-plugins-base-1.2.4-r1
index dbb7dd540c58..02c00442e66f 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-1.2.4-r1
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)
 REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=55bfacc1ffa432b46616adccadc6f4de
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.4.5 b/metadata/md5-cache/media-libs/gst-plugins-base-1.4.5
index 79db32d4c1ba..0da3ec5c3e1e 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-1.4.5
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=app-text/iso-codes >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)
 REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bbd036768e26826f48586b74f2a2cbb0
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-0.10.31-r1 b/metadata/md5-cache/media-libs/gst-plugins-good-0.10.31-r1
index cf988f63b3d3..20406a592658 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-good-0.10.31-r1
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-0.10.31-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] >=media-libs/gstreamer-0.10.36:0.10[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(-)?] >=media-libs/gst-plugins-base-0.10.36:0.10[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(-)?] >=app-arch/bzip2-1.0.6-r4[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(-)?] >=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(-)?] orc? ( >=dev-lang/orc-0.4.17[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(-)?] ) >=dev-libs/glib-2.38.2-r1:2[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(-)?] >=media-libs/gstreamer-0.10.36-r2:0.10[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-gstplugins[-abi_x86_32(-)] )
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eae91ca376288fd7b12eb4b51679f85f
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-1.2.4-r1 b/metadata/md5-cache/media-libs/gst-plugins-good-1.2.4-r1
index afd933f2d8e9..4a1dd3831b7f 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-good-1.2.4-r1
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-1.2.4-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] >=media-libs/gst-plugins-base-1.2.3:1.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(-)?] >=media-libs/gstreamer-1.2.4:1.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(-)?] >=app-arch/bzip2-1.0.6-r4[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(-)?] >=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(-)?] orc? ( >=dev-lang/orc-0.4.17[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(-)?] ) !<media-libs/gst-plugins-bad-1.1:1.0 >=dev-libs/glib-2.38.2-r1:2[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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?]
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4c1ab1428f04b12bd2a1493908b59a8f
diff --git a/metadata/md5-cache/media-libs/gst-plugins-good-1.4.5 b/metadata/md5-cache/media-libs/gst-plugins-good-1.4.5
index a95eb6047547..772dcf369e3b 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-good-1.4.5
+++ b/metadata/md5-cache/media-libs/gst-plugins-good-1.4.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] >=media-libs/gst-plugins-base-1.4.5:1.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(-)?] >=media-libs/gstreamer-1.4.5:1.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(-)?] >=app-arch/bzip2-1.0.6-r4[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(-)?] >=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(-)?] orc? ( >=dev-lang/orc-0.4.17[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(-)?] ) !<media-libs/gst-plugins-bad-1.1:1.0 >=dev-libs/glib-2.38.2-r1:2[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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?]
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0f3b7acb0b67d13da353b5e8f874d3fd
diff --git a/metadata/md5-cache/media-libs/gst-plugins-ugly-0.10.19-r1 b/metadata/md5-cache/media-libs/gst-plugins-ugly-0.10.19-r1
index 7a7e3b3f834d..45d7acbc7823 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-ugly-0.10.19-r1
+++ b/metadata/md5-cache/media-libs/gst-plugins-ugly-0.10.19-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] >=media-libs/gstreamer-0.10.36:0.10[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(-)?] >=media-libs/gst-plugins-base-0.10.36:0.10[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(-)?] orc? ( >=dev-lang/orc-0.4.17[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(-)?] ) !<media-libs/gst-plugins-bad-0.10.13 >=dev-libs/glib-2.38.2-r1:2[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(-)?] >=media-libs/gstreamer-0.10.36-r2:0.10[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-gstplugins[-abi_x86_32(-)] )
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3fb26fe353d407fdb48162f80bba99ae
diff --git a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.2.4-r1 b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.2.4-r1
index 2266f8ffc138..0b48d8bad480 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.2.4-r1
+++ b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.2.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] >=media-libs/gstreamer-1.2.4:1.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(-)?] >=media-libs/gst-plugins-base-1.2:1.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(-)?] orc? ( >=dev-lang/orc-0.4.17[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(-)?] ) >=dev-libs/glib-2.38.2-r1:2[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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?]
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=096292c8f701a06ba77adf3ae0458f79
diff --git a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.4.5 b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.4.5
index 865500a6011a..9f8204e1a010 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-ugly-1.4.5
+++ b/metadata/md5-cache/media-libs/gst-plugins-ugly-1.4.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] >=media-libs/gstreamer-1.4.0:1.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(-)?] >=media-libs/gst-plugins-base-1.4.0:1.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(-)?] orc? ( >=dev-lang/orc-0.4.17[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(-)?] ) >=dev-libs/glib-2.38.2-r1:2[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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?]
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b502e3f90c05181e5b63d7469d92fe59
diff --git a/metadata/md5-cache/media-libs/gst-rtsp-server-0.10.8-r1 b/metadata/md5-cache/media-libs/gst-rtsp-server-0.10.8-r1
index 8b3bd19e3e48..2b6f73f19e28 100644
--- a/metadata/md5-cache/media-libs/gst-rtsp-server-0.10.8-r1
+++ b/metadata/md5-cache/media-libs/gst-rtsp-server-0.10.8-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-0.10.8.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c0b4b03e82e522fcf69d58e4f3aaefaf
diff --git a/metadata/md5-cache/media-libs/gst-rtsp-server-1.4.5 b/metadata/md5-cache/media-libs/gst-rtsp-server-1.4.5
index 6dde3ab04f47..17cc6ff03217 100644
--- a/metadata/md5-cache/media-libs/gst-rtsp-server-1.4.5
+++ b/metadata/md5-cache/media-libs/gst-rtsp-server-1.4.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.32:2[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(-)?] >=media-libs/gstreamer-1.4:1.0[introspection?,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(-)?] >=media-libs/gst-plugins-base-1.4:1.0[introspection?,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(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) >=dev-libs/glib-2.38.2-r1:2[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(-)?] >=media-libs/gstreamer-1.2.4-r1:1.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(-)?]
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5ae1af317444ebea4c3defb5c77290e5
diff --git a/metadata/md5-cache/media-libs/gstreamer-0.10.36-r2 b/metadata/md5-cache/media-libs/gstreamer-0.10.36-r2
index 226148b76b71..ad0dfa83532d 100644
--- a/metadata/md5-cache/media-libs/gstreamer-0.10.36-r2
+++ b/metadata/md5-cache/media-libs/gstreamer-0.10.36-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] >=dev-libs/libxml2-2.9.1-r4[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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r5 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) !<media-libs/gst-plugins-base-0.10.26
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.36.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4ff3061785d4771ac1c7cecc7d1a70f7
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.2.4-r2 b/metadata/md5-cache/media-libs/gstreamer-1.2.4-r2
index 1c7a6694f0f5..725efe9da104 100644
--- a/metadata/md5-cache/media-libs/gstreamer-1.2.4-r2
+++ b/metadata/md5-cache/media-libs/gstreamer-1.2.4-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=665b33e13f039fd1cd96c93a16d719a4
diff --git a/metadata/md5-cache/media-libs/gstreamer-1.4.5 b/metadata/md5-cache/media-libs/gstreamer-1.4.5
index 25029cc1568e..6d4242c0dde6 100644
--- a/metadata/md5-cache/media-libs/gstreamer-1.4.5
+++ b/metadata/md5-cache/media-libs/gstreamer-1.4.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0b8cfb50a8b4e95a3c21dfa454e9728c
diff --git a/metadata/md5-cache/media-libs/harfbuzz-0.9.35 b/metadata/md5-cache/media-libs/harfbuzz-0.9.35
index ffb4b3a8b9bb..5c65f2a943e3 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-0.9.35
+++ b/metadata/md5-cache/media-libs/harfbuzz-0.9.35
@@ -10,5 +10,5 @@ RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(
 REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
 SRC_URI=http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.35.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=06502fc3e1cd6d16b71d1b571fb1a9a6
diff --git a/metadata/md5-cache/media-libs/harfbuzz-0.9.38 b/metadata/md5-cache/media-libs/harfbuzz-0.9.38
index e49352996ae1..0ac78c96940f 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-0.9.38
+++ b/metadata/md5-cache/media-libs/harfbuzz-0.9.38
@@ -10,5 +10,5 @@ RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(
 REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
 SRC_URI=http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.38.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d1a140190ee3bb5495219797fe28b3f5
diff --git a/metadata/md5-cache/media-libs/harfbuzz-0.9.40 b/metadata/md5-cache/media-libs/harfbuzz-0.9.40
index b524c8bdd8be..1d9e091c502f 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-0.9.40
+++ b/metadata/md5-cache/media-libs/harfbuzz-0.9.40
@@ -10,5 +10,5 @@ RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(
 REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
 SRC_URI=http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.40.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6a34ff86f94f417bfb3415e1f6bbd994
diff --git a/metadata/md5-cache/media-libs/harfbuzz-9999 b/metadata/md5-cache/media-libs/harfbuzz-9999
index d68907713e69..eb6cfa260adf 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-9999
+++ b/metadata/md5-cache/media-libs/harfbuzz-9999
@@ -8,5 +8,5 @@ LICENSE=Old-MIT ISC icu
 RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.34.3:2[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(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[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(-)?] ) icu? ( >=dev-libs/icu-51.2-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34 ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[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(-)?] )
 REQUIRED_USE=introspection? ( glib )
 SLOT=0/0.9.18
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4cc8ed60ad52144e18a5a0c0cd91ff3d
diff --git a/metadata/md5-cache/media-libs/ilmbase-2.0.1-r1 b/metadata/md5-cache/media-libs/ilmbase-2.0.1-r1
index fe267fbd20b5..9d5f2544d984 100644
--- a/metadata/md5-cache/media-libs/ilmbase-2.0.1-r1
+++ b/metadata/md5-cache/media-libs/ilmbase-2.0.1-r1
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 -arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86
 LICENSE=BSD
 SLOT=0/2.0.1
 SRC_URI=http://download.savannah.gnu.org/releases/openexr/ilmbase-2.0.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e51444e32bf5f8a8306a09584bfcf309
diff --git a/metadata/md5-cache/media-libs/ilmbase-2.1.0 b/metadata/md5-cache/media-libs/ilmbase-2.1.0
index bfb0d0fd915c..d6e88c2a919c 100644
--- a/metadata/md5-cache/media-libs/ilmbase-2.1.0
+++ b/metadata/md5-cache/media-libs/ilmbase-2.1.0
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 -arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x
 LICENSE=BSD
 SLOT=0/11
 SRC_URI=http://download.savannah.gnu.org/releases/openexr/ilmbase-2.1.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2d4320ed8f26f5d523f06e6762d14386
diff --git a/metadata/md5-cache/media-libs/ilmbase-2.2.0 b/metadata/md5-cache/media-libs/ilmbase-2.2.0
index 4d4c41907492..420141a471cd 100644
--- a/metadata/md5-cache/media-libs/ilmbase-2.2.0
+++ b/metadata/md5-cache/media-libs/ilmbase-2.2.0
@@ -7,5 +7,5 @@ KEYWORDS=~alpha ~amd64 -arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86
 LICENSE=BSD
 SLOT=0/12
 SRC_URI=http://download.savannah.gnu.org/releases/openexr/ilmbase-2.2.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1d1c4ed976c8fd25d2fddcfacb7eb532
diff --git a/metadata/md5-cache/media-libs/imlib-1.9.15-r4 b/metadata/md5-cache/media-libs/imlib-1.9.15-r4
index da84c2342b05..82ad7cc32a2d 100644
--- a/metadata/md5-cache/media-libs/imlib-1.9.15-r4
+++ b/metadata/md5-cache/media-libs/imlib-1.9.15-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/tiff-3.9.7-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(-)?] >=media-libs/giflib-4.1.6-r3[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(-)?] >=media-libs/libpng-1.2.51[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(-)?] >=virtual/jpeg-0-r2: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(-)?] >=x11-libs/libICE-1.0.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(-)?] >=x11-libs/libSM-1.2.1-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(-)?] >=x11-libs/libXext-1.3.2[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-gtklibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-gtklibs-20140406 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/imlib/1.9/imlib-1.9.15.tar.bz2 mirror://gentoo/gtk-1-for-imlib.m4.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=915a94eda0f96ea94d0d00c7615bdbe9
diff --git a/metadata/md5-cache/media-libs/imlib2-1.4.6-r2 b/metadata/md5-cache/media-libs/imlib2-1.4.6-r2
index 8545617c2471..c9527f3fe94a 100644
--- a/metadata/md5-cache/media-libs/imlib2-1.4.6-r2
+++ b/metadata/md5-cache/media-libs/imlib2-1.4.6-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==media-libs/freetype-2*[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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) gif? ( >=media-libs/giflib-4.1.6-r3[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(-)?] ) png? ( >=media-libs/libpng-1.6.10: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(-)?] ) jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) tiff? ( >=media-libs/tiff-4.0.3-r6: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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] ) mp3? ( >=media-libs/libid3tag-0.15.1b-r3[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(-)?] ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=mirror://sourceforge/enlightenment/imlib2-1.4.6.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	enlightenment	98392d364f7f4c6cde8a516cbc298472	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	enlightenment	98392d364f7f4c6cde8a516cbc298472	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8dc228c1072be5a12a2e01a6a99f0093
diff --git a/metadata/md5-cache/media-libs/imlib2-1.4.7 b/metadata/md5-cache/media-libs/imlib2-1.4.7
index 680b9a5979f2..e36fe58447c8 100644
--- a/metadata/md5-cache/media-libs/imlib2-1.4.7
+++ b/metadata/md5-cache/media-libs/imlib2-1.4.7
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==media-libs/freetype-2*[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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) gif? ( >=media-libs/giflib-4.1.6-r3[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(-)?] ) png? ( >=media-libs/libpng-1.6.10: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(-)?] ) jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) tiff? ( >=media-libs/tiff-4.0.3-r6: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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] ) mp3? ( >=media-libs/libid3tag-0.15.1b-r3[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(-)?] ) nls? ( sys-devel/gettext )
 SLOT=0
 SRC_URI=mirror://sourceforge/enlightenment/imlib2-1.4.7.tar.gz
-_eclasses_=enlightenment	98392d364f7f4c6cde8a516cbc298472	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=enlightenment	98392d364f7f4c6cde8a516cbc298472	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=591a6081a74c3d31d26addb6154f7d4f
diff --git a/metadata/md5-cache/media-libs/imlib2-9999 b/metadata/md5-cache/media-libs/imlib2-9999
index 301c5d1c0fd7..2645a75c6974 100644
--- a/metadata/md5-cache/media-libs/imlib2-9999
+++ b/metadata/md5-cache/media-libs/imlib2-9999
@@ -7,5 +7,5 @@ IUSE=bzip2 gif jpeg cpu_flags_x86_mmx mp3 png static-libs tiff X zlib nls doc ab
 LICENSE=BSD
 RDEPEND==media-libs/freetype-2*[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(-)?] bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) gif? ( >=media-libs/giflib-4.1.6-r3[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(-)?] ) png? ( >=media-libs/libpng-1.6.10: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(-)?] ) jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) tiff? ( >=media-libs/tiff-4.0.3-r6: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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] ) mp3? ( >=media-libs/libid3tag-0.15.1b-r3[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(-)?] ) nls? ( sys-devel/gettext )
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	enlightenment	98392d364f7f4c6cde8a516cbc298472	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	enlightenment	98392d364f7f4c6cde8a516cbc298472	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4b143cf9ad1e0630a8d2003ba0bdec60
diff --git a/metadata/md5-cache/media-libs/jasper-1.900.1-r9 b/metadata/md5-cache/media-libs/jasper-1.900.1-r9
index d0551bd3555b..93a694695138 100644
--- a/metadata/md5-cache/media-libs/jasper-1.900.1-r9
+++ b/metadata/md5-cache/media-libs/jasper-1.900.1-r9
@@ -9,5 +9,5 @@ LICENSE=JasPer2.0
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) opengl? ( >=virtual/opengl-7.0-r1: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(-)?] >=media-libs/freeglut-2.8.1: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(-)?] virtual/glu )
 SLOT=0
 SRC_URI=http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.900.1.zip mirror://gentoo/jasper-1.900.1-fixes-20120611.patch.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8374642a7ccc08f7d0d2d6e796367b7f
diff --git a/metadata/md5-cache/media-libs/jbigkit-2.1 b/metadata/md5-cache/media-libs/jbigkit-2.1
index 67136b135ec2..96ffbc3d5799 100644
--- a/metadata/md5-cache/media-libs/jbigkit-2.1
+++ b/metadata/md5-cache/media-libs/jbigkit-2.1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 LICENSE=GPL-2
 SLOT=0/2.1
 SRC_URI=http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-2.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f62dcbc93cc50e15bb707a09193c363d
diff --git a/metadata/md5-cache/media-libs/jpeg-6b-r12 b/metadata/md5-cache/media-libs/jpeg-6b-r12
index 999f884af59e..eaaca61e6726 100644
--- a/metadata/md5-cache/media-libs/jpeg-6b-r12
+++ b/metadata/md5-cache/media-libs/jpeg-6b-r12
@@ -9,5 +9,5 @@ LICENSE=IJG
 RDEPEND=!>=media-libs/libjpeg-turbo-1.3.0-r2:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=62
 SRC_URI=mirror://gentoo/jpegsrc.v6b.tar.gz http://dev.gentoo.org/~ssuominen/jpeg-6b-patchset-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=336d41c541f0ddc4b98cac64dbd62e4d
diff --git a/metadata/md5-cache/media-libs/jpeg-8d-r1 b/metadata/md5-cache/media-libs/jpeg-8d-r1
index fa99effc624f..d1a46356f809 100644
--- a/metadata/md5-cache/media-libs/jpeg-8d-r1
+++ b/metadata/md5-cache/media-libs/jpeg-8d-r1
@@ -9,5 +9,5 @@ LICENSE=IJG
 RDEPEND=!media-libs/libjpeg-turbo:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.ijg.org/files/jpegsrc.v8d.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e03f638174b0a3ace7b4f7ae4115e772
diff --git a/metadata/md5-cache/media-libs/jpeg-8d-r2 b/metadata/md5-cache/media-libs/jpeg-8d-r2
index 66b17785639a..a4b2962b05cc 100644
--- a/metadata/md5-cache/media-libs/jpeg-8d-r2
+++ b/metadata/md5-cache/media-libs/jpeg-8d-r2
@@ -9,5 +9,5 @@ LICENSE=IJG
 RDEPEND=!=media-libs/jpeg-8*:0 !<media-libs/libjpeg-turbo-1.3.0-r2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=8
 SRC_URI=http://www.ijg.org/files/jpegsrc.v8d.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=03b77bb36ab4bb3a7eae57b7e4204c13
diff --git a/metadata/md5-cache/media-libs/jpeg-9a b/metadata/md5-cache/media-libs/jpeg-9a
index f980ca733952..ca1d22c404bf 100644
--- a/metadata/md5-cache/media-libs/jpeg-9a
+++ b/metadata/md5-cache/media-libs/jpeg-9a
@@ -9,5 +9,5 @@ LICENSE=IJG
 RDEPEND=!media-libs/libjpeg-turbo:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.ijg.org/files/jpegsrc.v9a.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=3d49c2adf82e4edc00c2910e2e5dc3f7
diff --git a/metadata/md5-cache/media-libs/ladspa-cmt-1.16-r4 b/metadata/md5-cache/media-libs/ladspa-cmt-1.16-r4
index 04e9d8f2ad5e..991c655a312f 100644
--- a/metadata/md5-cache/media-libs/ladspa-cmt-1.16-r4
+++ b/metadata/md5-cache/media-libs/ladspa-cmt-1.16-r4
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.ladspa.org/download/cmt_src_1.16.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b3fa372eefde02ca388378f8b869a433
diff --git a/metadata/md5-cache/media-libs/ladspa-sdk-1.13-r2 b/metadata/md5-cache/media-libs/ladspa-sdk-1.13-r2
index 790db32c7a8f..1e30aa722e04 100644
--- a/metadata/md5-cache/media-libs/ladspa-sdk-1.13-r2
+++ b/metadata/md5-cache/media-libs/ladspa-sdk-1.13-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.ladspa.org/download/ladspa_sdk_1.13.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c15cbf7296eea043c778887cec30bb90
diff --git a/metadata/md5-cache/media-libs/lcms-2.6-r1 b/metadata/md5-cache/media-libs/lcms-2.6-r1
index 7535631af17d..6af2cb179b75 100644
--- a/metadata/md5-cache/media-libs/lcms-2.6-r1
+++ b/metadata/md5-cache/media-libs/lcms-2.6-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) tiff? ( >=media-libs/tiff-4.0.3-r6: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(-)?] ) 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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r10 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=mirror://sourceforge/lcms/lcms2-2.6.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=102c21fa90507e9d98098876e1a0af56
diff --git a/metadata/md5-cache/media-libs/lensfun-0.3.1 b/metadata/md5-cache/media-libs/lensfun-0.3.1
new file mode 100644
index 000000000000..949dfad8bbf0
--- /dev/null
+++ b/metadata/md5-cache/media-libs/lensfun-0.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/glib-2.28 media-libs/libpng:0= sys-libs/zlib:= doc? ( app-doc/doxygen dev-python/docutils ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=lensfun: A library for rectifying and simulating photographic lens distortions
+EAPI=5
+HOMEPAGE=http://lensfun.sourceforge.net/
+IUSE=doc cpu_flags_x86_sse cpu_flags_x86_sse2 test python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+LICENSE=LGPL-3 CC-BY-SA-3.0
+RDEPEND=>=dev-libs/glib-2.28 media-libs/libpng:0= sys-libs/zlib:=
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=mirror://sourceforge/lensfun/lensfun-0.3.1.tar.gz
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=5616ea5af3c526f9c290734167e28b50
diff --git a/metadata/md5-cache/media-libs/leptonica-1.72-r2 b/metadata/md5-cache/media-libs/leptonica-1.72-r2
index b83778667bcd..64b24390adc4 100644
--- a/metadata/md5-cache/media-libs/leptonica-1.72-r2
+++ b/metadata/md5-cache/media-libs/leptonica-1.72-r2
@@ -10,5 +10,5 @@ RDEPEND=gif? ( media-libs/giflib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 REQUIRED_USE=test? ( jpeg png tiff )
 SLOT=0
 SRC_URI=http://www.leptonica.com/source/leptonica-1.72.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7a5378875a0a6953a1561de314ffb116
diff --git a/metadata/md5-cache/media-libs/libXcm-0.5.2-r1 b/metadata/md5-cache/media-libs/libXcm-0.5.2-r1
index 9ffa629b910b..041751d3c166 100644
--- a/metadata/md5-cache/media-libs/libXcm-0.5.2-r1
+++ b/metadata/md5-cache/media-libs/libXcm-0.5.2-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=X? ( >=x11-libs/libXmu-1.1.1-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(-)?] >=x11-libs/libXfixes-5.0.1[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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-proto/xproto-7.0.24[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
 SRC_URI=mirror://sourceforge/oyranos/libXcm/libXcm-0.4.x/libXcm-0.5.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=66fda30a9a62e012e9d87d034f5c9998
diff --git a/metadata/md5-cache/media-libs/libXcm-0.5.3 b/metadata/md5-cache/media-libs/libXcm-0.5.3
index e08942973fef..6b0a0ba238b7 100644
--- a/metadata/md5-cache/media-libs/libXcm-0.5.3
+++ b/metadata/md5-cache/media-libs/libXcm-0.5.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=X? ( >=x11-libs/libXmu-1.1.1-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(-)?] >=x11-libs/libXfixes-5.0.1[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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-proto/xproto-7.0.24[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
 SRC_URI=mirror://sourceforge/oyranos/libXcm/libXcm-0.4.x/libXcm-0.5.3.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6734d4eb9e1d5969c472e17a9c8f0a5c
diff --git a/metadata/md5-cache/media-libs/libXcm-9999 b/metadata/md5-cache/media-libs/libXcm-9999
index 4862cb20ad25..866b304b6413 100644
--- a/metadata/md5-cache/media-libs/libXcm-9999
+++ b/metadata/md5-cache/media-libs/libXcm-9999
@@ -7,5 +7,5 @@ IUSE=X static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 a
 LICENSE=MIT
 RDEPEND=X? ( >=x11-libs/libXmu-1.1.1-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(-)?] >=x11-libs/libXfixes-5.0.1[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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-proto/xproto-7.0.24[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
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=47605c8833e4b20f1e53e0640b53b528
diff --git a/metadata/md5-cache/media-libs/libaacplus-2.0.2-r2 b/metadata/md5-cache/media-libs/libaacplus-2.0.2-r2
index 2bc8b2d33f45..ef0a922160aa 100644
--- a/metadata/md5-cache/media-libs/libaacplus-2.0.2-r2
+++ b/metadata/md5-cache/media-libs/libaacplus-2.0.2-r2
@@ -10,5 +10,5 @@ RDEPEND=!media-sound/aacplusenc fftw? ( >=sci-libs/fftw-3.3.3-r2:3.0[abi_x86_32(
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~aballier/libaacplus-2.0.2.tar.gz http://tipok.ath.cx/downloads/media/aac+/libaacplus/libaacplus-2.0.2.tar.gz http://217.20.164.161/~tipok/aacplus/libaacplus-2.0.2.tar.gz http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/26410-800.zip
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=09e56b157e7304b427b038cc224554ef
diff --git a/metadata/md5-cache/media-libs/libaacs-0.7.1 b/metadata/md5-cache/media-libs/libaacs-0.7.1
index 96b2a7626940..ec0d144f511c 100644
--- a/metadata/md5-cache/media-libs/libaacs-0.7.1
+++ b/metadata/md5-cache/media-libs/libaacs-0.7.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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(-)?] >=dev-libs/libgpg-error-1.12[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
 SRC_URI=ftp://ftp.videolan.org/pub/videolan/libaacs/0.7.1/libaacs-0.7.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=3388d872a583e370c0895e2c510d50cd
diff --git a/metadata/md5-cache/media-libs/libaacs-0.8.0 b/metadata/md5-cache/media-libs/libaacs-0.8.0
index bf293543e1f2..f104db2180e9 100644
--- a/metadata/md5-cache/media-libs/libaacs-0.8.0
+++ b/metadata/md5-cache/media-libs/libaacs-0.8.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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(-)?] >=dev-libs/libgpg-error-1.12[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
 SRC_URI=ftp://ftp.videolan.org/pub/videolan/libaacs/0.8.0/libaacs-0.8.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=724fa6a99d3ffa9aa27ef6c1b1766063
diff --git a/metadata/md5-cache/media-libs/libaacs-0.8.1 b/metadata/md5-cache/media-libs/libaacs-0.8.1
index 16cc655a87f3..2ada355eed1c 100644
--- a/metadata/md5-cache/media-libs/libaacs-0.8.1
+++ b/metadata/md5-cache/media-libs/libaacs-0.8.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=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(-)?] >=dev-libs/libgpg-error-1.12[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
 SRC_URI=ftp://ftp.videolan.org/pub/videolan/libaacs/0.8.1/libaacs-0.8.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0cef49b6b9beba87f36c79225205761a
diff --git a/metadata/md5-cache/media-libs/libao-1.1.0-r2 b/metadata/md5-cache/media-libs/libao-1.1.0-r2
index 21f0cde16392..4d25759baa57 100644
--- a/metadata/md5-cache/media-libs/libao-1.1.0-r2
+++ b/metadata/md5-cache/media-libs/libao-1.1.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[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(-)?] ) nas? ( >=media-libs/nas-1.9.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/ao/libao-1.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=301a2468c2506710c6004ad2f239c1ea
diff --git a/metadata/md5-cache/media-libs/libao-1.2.0 b/metadata/md5-cache/media-libs/libao-1.2.0
index 2cf878cb1898..679a1cc2a661 100644
--- a/metadata/md5-cache/media-libs/libao-1.2.0
+++ b/metadata/md5-cache/media-libs/libao-1.2.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[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(-)?] ) nas? ( >=media-libs/nas-1.9.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20131008-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/ao/libao-1.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=120786f56e4913bba97d292b2c91b45b
diff --git a/metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r2 b/metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r2
index 7746c8ed6818..a3c67187f050 100644
--- a/metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r2
+++ b/metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r2
@@ -10,5 +10,5 @@ RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r6 !app-
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/libart_lgpl/2.3/libart_lgpl-2.3.21.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bddf2e684e6cf0a049a3684f45852319
diff --git a/metadata/md5-cache/media-libs/libass-0.11.1 b/metadata/md5-cache/media-libs/libass-0.11.1
index c76a7a4a1a6b..2195c96f177b 100644
--- a/metadata/md5-cache/media-libs/libass-0.11.1
+++ b/metadata/md5-cache/media-libs/libass-0.11.1
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[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(-)?] ) >=media-libs/freetype-2.5.0.1:2[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(-)?] >=virtual/libiconv-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(-)?] >=dev-libs/fribidi-0.19.5-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(-)?] harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,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(-)?] ) enca? ( >=app-i18n/enca-1.14-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/5
 SRC_URI=http://github.com/libass/libass/releases/download/0.11.1/libass-0.11.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1912a362c5d6054773ab730b04f7b67e
diff --git a/metadata/md5-cache/media-libs/libass-0.11.2 b/metadata/md5-cache/media-libs/libass-0.11.2
index 85f2a7230778..2d3a2a4dfcdb 100644
--- a/metadata/md5-cache/media-libs/libass-0.11.2
+++ b/metadata/md5-cache/media-libs/libass-0.11.2
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[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(-)?] ) >=media-libs/freetype-2.5.0.1:2[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(-)?] >=virtual/libiconv-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(-)?] >=dev-libs/fribidi-0.19.5-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(-)?] harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,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(-)?] ) enca? ( >=app-i18n/enca-1.14-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/5
 SRC_URI=http://github.com/libass/libass/releases/download/0.11.2/libass-0.11.2.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ab1aa8d47b3001a1cbe2e41f9adc7693
diff --git a/metadata/md5-cache/media-libs/libass-0.12.0 b/metadata/md5-cache/media-libs/libass-0.12.0
index 8fb5abb8c090..309419a19b58 100644
--- a/metadata/md5-cache/media-libs/libass-0.12.0
+++ b/metadata/md5-cache/media-libs/libass-0.12.0
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[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(-)?] ) >=media-libs/freetype-2.5.0.1:2[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(-)?] >=virtual/libiconv-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(-)?] >=dev-libs/fribidi-0.19.5-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(-)?] harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,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(-)?] ) enca? ( >=app-i18n/enca-1.14-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/5
 SRC_URI=http://github.com/libass/libass/releases/download/0.12.0/libass-0.12.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=edc59d7cdce539aa7b84ac638dc77c55
diff --git a/metadata/md5-cache/media-libs/libass-0.12.1 b/metadata/md5-cache/media-libs/libass-0.12.1
index c1188af8c346..843c7b1408a3 100644
--- a/metadata/md5-cache/media-libs/libass-0.12.1
+++ b/metadata/md5-cache/media-libs/libass-0.12.1
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[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(-)?] ) >=media-libs/freetype-2.5.0.1:2[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(-)?] >=virtual/libiconv-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(-)?] >=dev-libs/fribidi-0.19.5-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(-)?] harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,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(-)?] ) enca? ( >=app-i18n/enca-1.14-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/5
 SRC_URI=http://github.com/libass/libass/releases/download/0.12.1/libass-0.12.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b3e73c6fee5cf624633bba7bfd56d149
diff --git a/metadata/md5-cache/media-libs/libass-0.12.2 b/metadata/md5-cache/media-libs/libass-0.12.2
index 22ecf3f6a3fa..94247a3b62e0 100644
--- a/metadata/md5-cache/media-libs/libass-0.12.2
+++ b/metadata/md5-cache/media-libs/libass-0.12.2
@@ -9,5 +9,5 @@ LICENSE=ISC
 RDEPEND=fontconfig? ( >=media-libs/fontconfig-2.10.92[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(-)?] ) >=media-libs/freetype-2.5.0.1:2[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(-)?] >=virtual/libiconv-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(-)?] >=dev-libs/fribidi-0.19.5-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(-)?] harfbuzz? ( >=media-libs/harfbuzz-0.9.12[truetype,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(-)?] ) enca? ( >=app-i18n/enca-1.14-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/5
 SRC_URI=http://github.com/libass/libass/releases/download/0.12.2/libass-0.12.2.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d97a4c316713e9b243c906d5c929c465
diff --git a/metadata/md5-cache/media-libs/libbdplus-0.1.2 b/metadata/md5-cache/media-libs/libbdplus-0.1.2
index eefbfabfc7f8..714efba35d74 100644
--- a/metadata/md5-cache/media-libs/libbdplus-0.1.2
+++ b/metadata/md5-cache/media-libs/libbdplus-0.1.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt: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(-)?] dev-libs/libgpg-error[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(-)?] aacs? ( >=media-libs/libaacs-0.7.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(-)?] )
 SLOT=0
 SRC_URI=http://ftp.videolan.org/pub/videolan/libbdplus/0.1.2/libbdplus-0.1.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6afce3ddf8a530eae56e8718b27b48d8
diff --git a/metadata/md5-cache/media-libs/libbdplus-9999 b/metadata/md5-cache/media-libs/libbdplus-9999
index ee101d62bebd..17a5dfb8e741 100644
--- a/metadata/md5-cache/media-libs/libbdplus-9999
+++ b/metadata/md5-cache/media-libs/libbdplus-9999
@@ -7,5 +7,5 @@ IUSE=aacs static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n6
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/libgcrypt: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(-)?] dev-libs/libgpg-error[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(-)?] aacs? ( >=media-libs/libaacs-0.7.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(-)?] )
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=37e33c5ee95d41cd25146fadc234e2b6
diff --git a/metadata/md5-cache/media-libs/libbluray-0.5.0-r1 b/metadata/md5-cache/media-libs/libbluray-0.5.0-r1
index 1f6281e7a650..518848187082 100644
--- a/metadata/md5-cache/media-libs/libbluray-0.5.0-r1
+++ b/metadata/md5-cache/media-libs/libbluray-0.5.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[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(-)?] ) aacs? ( >=media-libs/libaacs-0.6.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(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://ftp.videolan.org/pub/videolan/libbluray/0.5.0/libbluray-0.5.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=58dad86490b37d0ff1214d12cc4d3734
diff --git a/metadata/md5-cache/media-libs/libbluray-0.6.1 b/metadata/md5-cache/media-libs/libbluray-0.6.1
index 4d2d83e5e3fe..8d6b7ed519c7 100644
--- a/metadata/md5-cache/media-libs/libbluray-0.6.1
+++ b/metadata/md5-cache/media-libs/libbluray-0.6.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[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(-)?] ) aacs? ( >=media-libs/libaacs-0.6.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(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://ftp.videolan.org/pub/videolan/libbluray/0.6.1/libbluray-0.6.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9b7ae28a6802f9462331bb06b4469368
diff --git a/metadata/md5-cache/media-libs/libbluray-0.6.2 b/metadata/md5-cache/media-libs/libbluray-0.6.2
index 87232cf77967..821fb431dab4 100644
--- a/metadata/md5-cache/media-libs/libbluray-0.6.2
+++ b/metadata/md5-cache/media-libs/libbluray-0.6.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[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(-)?] ) aacs? ( >=media-libs/libaacs-0.6.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(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://ftp.videolan.org/pub/videolan/libbluray/0.6.2/libbluray-0.6.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d7111190ec923055f5fd2d70aee70539
diff --git a/metadata/md5-cache/media-libs/libbluray-0.7.0 b/metadata/md5-cache/media-libs/libbluray-0.7.0
index fed65114fb25..b74797d16270 100644
--- a/metadata/md5-cache/media-libs/libbluray-0.7.0
+++ b/metadata/md5-cache/media-libs/libbluray-0.7.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[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(-)?] ) aacs? ( >=media-libs/libaacs-0.6.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(-)?] ) bdplus? ( media-libs/libbdplus[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(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://ftp.videolan.org/pub/videolan/libbluray/0.7.0/libbluray-0.7.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=18a3147df3322df2743854418525221d
diff --git a/metadata/md5-cache/media-libs/libbluray-0.8.0 b/metadata/md5-cache/media-libs/libbluray-0.8.0
index dcff6cf94a48..d8b4d58c749c 100644
--- a/metadata/md5-cache/media-libs/libbluray-0.8.0
+++ b/metadata/md5-cache/media-libs/libbluray-0.8.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[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(-)?] ) aacs? ( >=media-libs/libaacs-0.6.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(-)?] ) bdplus? ( media-libs/libbdplus[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(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://ftp.videolan.org/pub/videolan/libbluray/0.8.0/libbluray-0.8.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1f1e4f6c74fb78ec5895aa008614b15e
diff --git a/metadata/md5-cache/media-libs/libbluray-0.8.1 b/metadata/md5-cache/media-libs/libbluray-0.8.1
index 10df058d7726..8121b010e2c7 100644
--- a/metadata/md5-cache/media-libs/libbluray-0.8.1
+++ b/metadata/md5-cache/media-libs/libbluray-0.8.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[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(-)?] ) aacs? ( >=media-libs/libaacs-0.6.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(-)?] ) bdplus? ( media-libs/libbdplus[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(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=http://ftp.videolan.org/pub/videolan/libbluray/0.8.1/libbluray-0.8.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8b63abd22668d7e0124b6933ee1dca62
diff --git a/metadata/md5-cache/media-libs/libbluray-9999 b/metadata/md5-cache/media-libs/libbluray-9999
index cba39db46af7..696e2c15e126 100644
--- a/metadata/md5-cache/media-libs/libbluray-9999
+++ b/metadata/md5-cache/media-libs/libbluray-9999
@@ -7,5 +7,5 @@ IUSE=aacs bdplus +fontconfig java static-libs +truetype utils +xml elibc_FreeBSD
 LICENSE=LGPL-2.1
 RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[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(-)?] ) aacs? ( >=media-libs/libaacs-0.6.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(-)?] ) bdplus? ( media-libs/libbdplus[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(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=551d748e310feffd408633a7a2944273
diff --git a/metadata/md5-cache/media-libs/libbs2b-3.1.0-r1 b/metadata/md5-cache/media-libs/libbs2b-3.1.0-r1
index 40b36237f347..198590b350df 100644
--- a/metadata/md5-cache/media-libs/libbs2b-3.1.0-r1
+++ b/metadata/md5-cache/media-libs/libbs2b-3.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=media-libs/libsndfile-1.0.25-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
 SRC_URI=mirror://sourceforge/bs2b/libbs2b-3.1.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4d19203ab2b4d5ec2d3d739f37310fb6
diff --git a/metadata/md5-cache/media-libs/libbs2b-3.1.0-r2 b/metadata/md5-cache/media-libs/libbs2b-3.1.0-r2
index bcb7ee8bd6c7..9633a0700f79 100644
--- a/metadata/md5-cache/media-libs/libbs2b-3.1.0-r2
+++ b/metadata/md5-cache/media-libs/libbs2b-3.1.0-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=media-libs/libsndfile-1.0.25-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
 SRC_URI=mirror://sourceforge/bs2b/libbs2b-3.1.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=211ee77094e3caab7f0a2df6ed17eeb5
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta18-r2 b/metadata/md5-cache/media-libs/libcaca-0.99_beta18-r2
index 3dc3af6f59e4..426f4fc3381d 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta18-r2
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta18-r2
@@ -10,5 +10,5 @@ RDEPEND=imlib? ( >=media-libs/imlib2-1.4.6-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta18.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	mono	203a4295c06155d318bdff9c6b2d5e1c	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	mono	203a4295c06155d318bdff9c6b2d5e1c	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=03490c73e49f5919176f75e8f0e98997
diff --git a/metadata/md5-cache/media-libs/libcaca-0.99_beta19 b/metadata/md5-cache/media-libs/libcaca-0.99_beta19
index 9f13bb1fd898..74dd9eb4aecd 100644
--- a/metadata/md5-cache/media-libs/libcaca-0.99_beta19
+++ b/metadata/md5-cache/media-libs/libcaca-0.99_beta19
@@ -10,5 +10,5 @@ RDEPEND=imlib? ( >=media-libs/imlib2-1.4.6-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_
 REQUIRED_USE=python? ( python_targets_python2_7 ) ruby? ( ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta19.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	ruby-ng	a23e4bd47d827c96336af5ad0fe254cf	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=be4a58d321034ab4e3c2de8c2c054e1a
diff --git a/metadata/md5-cache/media-libs/libcanberra-0.30-r5 b/metadata/md5-cache/media-libs/libcanberra-0.30-r5
index 27a3df060cc0..79dcde3baf01 100644
--- a/metadata/md5-cache/media-libs/libcanberra-0.30-r5
+++ b/metadata/md5-cache/media-libs/libcanberra-0.30-r5
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 REQUIRED_USE=udev? ( alsa )
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.30.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0cacf21c8356234be52cb0ca3ffcbd33
diff --git a/metadata/md5-cache/media-libs/libcddb-1.3.2-r1 b/metadata/md5-cache/media-libs/libcddb-1.3.2-r1
index e845dffd9d31..f0a81d525da7 100644
--- a/metadata/md5-cache/media-libs/libcddb-1.3.2-r1
+++ b/metadata/md5-cache/media-libs/libcddb-1.3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/libcddb/libcddb-1.3.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=49f50443af39c882974330b6024baa72
diff --git a/metadata/md5-cache/media-libs/libcuefile-477-r1 b/metadata/md5-cache/media-libs/libcuefile-477-r1
index d0496920a32b..df8f68d5ad7e 100644
--- a/metadata/md5-cache/media-libs/libcuefile-477-r1
+++ b/metadata/md5-cache/media-libs/libcuefile-477-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r2 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ssuominen/libcuefile-477.tar.xz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8fe349159b01674adb76994723ab3e45
diff --git a/metadata/md5-cache/media-libs/libdc1394-2.2.1 b/metadata/md5-cache/media-libs/libdc1394-2.2.1
index 3d50cdde0a38..df6bb22c4b39 100644
--- a/metadata/md5-cache/media-libs/libdc1394-2.2.1
+++ b/metadata/md5-cache/media-libs/libdc1394-2.2.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-libs/libraw1394-2.1.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(-)?] >=virtual/libusb-1-r1:1[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=2
 SRC_URI=mirror://sourceforge/libdc1394/libdc1394-2.2.1.tar.gz http://dev.gentoo.org/~ssuominen/sdl.m4-20140620.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=545e4d4aefa4569a4dd54845382033dd
diff --git a/metadata/md5-cache/media-libs/libdc1394-2.2.3 b/metadata/md5-cache/media-libs/libdc1394-2.2.3
index 08783614085b..dcfde3e874c0 100644
--- a/metadata/md5-cache/media-libs/libdc1394-2.2.3
+++ b/metadata/md5-cache/media-libs/libdc1394-2.2.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-libs/libraw1394-2.1.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(-)?] >=virtual/libusb-1-r1:1[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=2
 SRC_URI=mirror://sourceforge/libdc1394/libdc1394-2.2.3.tar.gz http://dev.gentoo.org/~ssuominen/sdl.m4-20140620.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d769e0bb89386d570475f043e6dc4a73
diff --git a/metadata/md5-cache/media-libs/libdca-0.0.5-r3 b/metadata/md5-cache/media-libs/libdca-0.0.5-r3
index a7e426f559a7..7319b351d841 100644
--- a/metadata/md5-cache/media-libs/libdca-0.0.5-r3
+++ b/metadata/md5-cache/media-libs/libdca-0.0.5-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!media-libs/libdts abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.videolan.org/pub/videolan/libdca/0.0.5/libdca-0.0.5.tar.bz2 mirror://gentoo/libdca-0.0.5-constant.patch.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1089a85440597c3ab0e0531f800785ce
diff --git a/metadata/md5-cache/media-libs/libde265-0.9 b/metadata/md5-cache/media-libs/libde265-0.9
index f003d71e2507..943043f0715a 100644
--- a/metadata/md5-cache/media-libs/libde265-0.9
+++ b/metadata/md5-cache/media-libs/libde265-0.9
@@ -10,5 +10,5 @@ RDEPEND=qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) qt5? ( dev-qt/qtgui:5 dev-qt/qtc
 REQUIRED_USE=tools? ( || ( qt4 qt5 ) )
 SLOT=0
 SRC_URI=https://github.com/strukturag/libde265/archive/v0.9.tar.gz -> libde265-0.9.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=28b1ff9d6741b2f01a9baea6a5ee3cb2
diff --git a/metadata/md5-cache/media-libs/libde265-9999 b/metadata/md5-cache/media-libs/libde265-9999
index fe16a9020244..117b47827933 100644
--- a/metadata/md5-cache/media-libs/libde265-9999
+++ b/metadata/md5-cache/media-libs/libde265-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 ) media-libs/libsdl virtual/ffmpeg
 REQUIRED_USE=tools? ( || ( qt4 qt5 ) )
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=84921ff2ecf7be5c7a856bb4cc837170
diff --git a/metadata/md5-cache/media-libs/libdv-1.0.0-r3 b/metadata/md5-cache/media-libs/libdv-1.0.0-r3
index 53e8075099bd..11d407c720f3 100644
--- a/metadata/md5-cache/media-libs/libdv-1.0.0-r3
+++ b/metadata/md5-cache/media-libs/libdv-1.0.0-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=dev-libs/popt abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r12 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/libdv/libdv-1.0.0.tar.gz mirror://gentoo/libdv-1.0.0-pic.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8f7e1d2652805aebf37f5adb0a709523
diff --git a/metadata/md5-cache/media-libs/libdvbpsi-1.2.0 b/metadata/md5-cache/media-libs/libdvbpsi-1.2.0
index ac53bb8a81d0..125b3094b637 100644
--- a/metadata/md5-cache/media-libs/libdvbpsi-1.2.0
+++ b/metadata/md5-cache/media-libs/libdvbpsi-1.2.0
@@ -4,8 +4,8 @@ DESCRIPTION=library for MPEG TS/DVB PSI tables decoding and generation
 EAPI=4
 HOMEPAGE=http://www.videolan.org/libdvbpsi
 IUSE=doc static-libs
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://download.videolan.org/pub/libdvbpsi/1.2.0/libdvbpsi-1.2.0.tar.bz2
-_md5_=76890c74c9c0331f7fcd5c89b230cb91
+_md5_=80a99fddda600d6fe943c0a96fc2d458
diff --git a/metadata/md5-cache/media-libs/libdvdcss-1.2.13-r1 b/metadata/md5-cache/media-libs/libdvdcss-1.2.13-r1
index 6956fb762a18..ad2eed15315f 100644
--- a/metadata/md5-cache/media-libs/libdvdcss-1.2.13-r1
+++ b/metadata/md5-cache/media-libs/libdvdcss-1.2.13-r1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x8
 LICENSE=GPL-2
 SLOT=1.2
 SRC_URI=http://www.videolan.org/pub/libdvdcss/1.2.13/libdvdcss-1.2.13.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b5558f60206233c67558d122aaa16c8d
diff --git a/metadata/md5-cache/media-libs/libdvdcss-1.3.0 b/metadata/md5-cache/media-libs/libdvdcss-1.3.0
index 287ee80cabed..bd42e132aad1 100644
--- a/metadata/md5-cache/media-libs/libdvdcss-1.3.0
+++ b/metadata/md5-cache/media-libs/libdvdcss-1.3.0
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fb
 LICENSE=GPL-2
 SLOT=1.2
 SRC_URI=http://www.videolan.org/pub/libdvdcss/1.3.0/libdvdcss-1.3.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f8e79014385ff56e1d7efbb8eaf4118e
diff --git a/metadata/md5-cache/media-libs/libdvdcss-1.3.99 b/metadata/md5-cache/media-libs/libdvdcss-1.3.99
index 27929d8e0e30..c0a8a4516831 100644
--- a/metadata/md5-cache/media-libs/libdvdcss-1.3.99
+++ b/metadata/md5-cache/media-libs/libdvdcss-1.3.99
@@ -8,5 +8,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64
 LICENSE=GPL-2
 SLOT=1.2
 SRC_URI=http://download.videolan.org/pub/libdvdcss/1.3.99/libdvdcss-1.3.99.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=54b1da02618d637bd8114382bd919281
diff --git a/metadata/md5-cache/media-libs/libdvdnav-4.2.1 b/metadata/md5-cache/media-libs/libdvdnav-4.2.1
index 64d83e0ce4ea..f34a27192aa7 100644
--- a/metadata/md5-cache/media-libs/libdvdnav-4.2.1
+++ b/metadata/md5-cache/media-libs/libdvdnav-4.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libdvdread-4.2.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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r4 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.1.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=30d766c4c2be98217a20b6e8d180f4cc
diff --git a/metadata/md5-cache/media-libs/libdvdnav-5.0.1 b/metadata/md5-cache/media-libs/libdvdnav-5.0.1
index 321ce9744d4e..e3cfead51d7f 100644
--- a/metadata/md5-cache/media-libs/libdvdnav-5.0.1
+++ b/metadata/md5-cache/media-libs/libdvdnav-5.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libdvdread-5.0.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-medialibs-20130224-r4 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://downloads.videolan.org/pub/videolan/libdvdnav/5.0.1/libdvdnav-5.0.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d4a1665d08a8ec8ca880a9861ad87e7b
diff --git a/metadata/md5-cache/media-libs/libdvdnav-5.0.3 b/metadata/md5-cache/media-libs/libdvdnav-5.0.3
index 5929e471e6dd..0e8cfa9d23ba 100644
--- a/metadata/md5-cache/media-libs/libdvdnav-5.0.3
+++ b/metadata/md5-cache/media-libs/libdvdnav-5.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libdvdread-5.0.2[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-medialibs-20130224-r4 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://downloads.videolan.org/pub/videolan/libdvdnav/5.0.3/libdvdnav-5.0.3.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a16f19ffa1a5169362392fbaf6c360be
diff --git a/metadata/md5-cache/media-libs/libdvdnav-9999 b/metadata/md5-cache/media-libs/libdvdnav-9999
index 6404458ddad5..aa834ba6e628 100644
--- a/metadata/md5-cache/media-libs/libdvdnav-9999
+++ b/metadata/md5-cache/media-libs/libdvdnav-9999
@@ -7,5 +7,5 @@ IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdvdread-5.0.2[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-medialibs-20130224-r4 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=697d0787bccb109e34c9969110f150fd
diff --git a/metadata/md5-cache/media-libs/libdvdread-4.2.1 b/metadata/md5-cache/media-libs/libdvdread-4.2.1
index 5a54b70471b1..6c65c424970b 100644
--- a/metadata/md5-cache/media-libs/libdvdread-4.2.1
+++ b/metadata/md5-cache/media-libs/libdvdread-4.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!<media-libs/libdvdnav-4.2.1 css? ( >=media-libs/libdvdcss-1.2.13[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-medialibs-20130224-r4 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://dvdnav.mplayerhq.hu/releases/libdvdread-4.2.1.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=fb0f3c1720b9afb6967af9d2854bcc62
diff --git a/metadata/md5-cache/media-libs/libdvdread-5.0.0-r2 b/metadata/md5-cache/media-libs/libdvdread-5.0.0-r2
index e0ce60d32adb..6aa9759b1967 100644
--- a/metadata/md5-cache/media-libs/libdvdread-5.0.0-r2
+++ b/metadata/md5-cache/media-libs/libdvdread-5.0.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=css? ( >=media-libs/libdvdcss-1.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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r4 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://downloads.videolan.org/pub/videolan/libdvdread/5.0.0/libdvdread-5.0.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a0eab01d9aea6e9beaad7a0c95d05d25
diff --git a/metadata/md5-cache/media-libs/libdvdread-5.0.2 b/metadata/md5-cache/media-libs/libdvdread-5.0.2
index d36b28fecfcc..162f48e8f16f 100644
--- a/metadata/md5-cache/media-libs/libdvdread-5.0.2
+++ b/metadata/md5-cache/media-libs/libdvdread-5.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=css? ( >=media-libs/libdvdcss-1.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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r4 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://downloads.videolan.org/pub/videolan/libdvdread/5.0.2/libdvdread-5.0.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c1a21c63b11cb47ea786592593ee2b40
diff --git a/metadata/md5-cache/media-libs/libdvdread-5.0.3 b/metadata/md5-cache/media-libs/libdvdread-5.0.3
index 0a1c2d42195e..93fc808ba0e5 100644
--- a/metadata/md5-cache/media-libs/libdvdread-5.0.3
+++ b/metadata/md5-cache/media-libs/libdvdread-5.0.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=css? ( >=media-libs/libdvdcss-1.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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r4 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://downloads.videolan.org/pub/videolan/libdvdread/5.0.3/libdvdread-5.0.3.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=3f8ada9fe07fce6244e3dda3716858ad
diff --git a/metadata/md5-cache/media-libs/libdvdread-9999 b/metadata/md5-cache/media-libs/libdvdread-9999
index 37977a2f7a72..1d096fda52bd 100644
--- a/metadata/md5-cache/media-libs/libdvdread-9999
+++ b/metadata/md5-cache/media-libs/libdvdread-9999
@@ -7,5 +7,5 @@ IUSE=+css static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n6
 LICENSE=GPL-2
 RDEPEND=css? ( >=media-libs/libdvdcss-1.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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r4 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8d9ecf48200175b3fb08b7967662cefe
diff --git a/metadata/md5-cache/media-libs/libepoxy-1.2 b/metadata/md5-cache/media-libs/libepoxy-1.2
index 87e56a88ce2c..7ddeeac2278f 100644
--- a/metadata/md5-cache/media-libs/libepoxy-1.2
+++ b/metadata/md5-cache/media-libs/libepoxy-1.2
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/anholt/libepoxy/archive/v1.2.tar.gz -> libepoxy-1.2.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=cc2270dee2762d281cdb4ae8511882de
diff --git a/metadata/md5-cache/media-libs/libepoxy-9999 b/metadata/md5-cache/media-libs/libepoxy-9999
index 333406ab84f7..0deb98d8b840 100644
--- a/metadata/md5-cache/media-libs/libepoxy-9999
+++ b/metadata/md5-cache/media-libs/libepoxy-9999
@@ -6,5 +6,5 @@ HOMEPAGE=https://github.com/anholt/libepoxy
 IUSE=test 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
 LICENSE=MIT
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2a1c7da06fb71268b13e7d43524bbef2
diff --git a/metadata/md5-cache/media-libs/libexif-0.6.21-r1 b/metadata/md5-cache/media-libs/libexif-0.6.21-r1
index 3ca5829cc890..85bc96de4405 100644
--- a/metadata/md5-cache/media-libs/libexif-0.6.21-r1
+++ b/metadata/md5-cache/media-libs/libexif-0.6.21-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://sourceforge/libexif/libexif-0.6.21.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=5619c9e6e204462215091ba20cd3267e
diff --git a/metadata/md5-cache/media-libs/libfame-0.9.1-r2 b/metadata/md5-cache/media-libs/libfame-0.9.1-r2
index 3f92f9a461bf..d5c611a6c848 100644
--- a/metadata/md5-cache/media-libs/libfame-0.9.1-r2
+++ b/metadata/md5-cache/media-libs/libfame-0.9.1-r2
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/fame/libfame-0.9.1.tar.gz http://digilander.libero.it/dgp85/gentoo/libfame-patches-2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=bc0452130982f4ed7c67cca7d5f27887
diff --git a/metadata/md5-cache/media-libs/libgii-1.0.2-r1 b/metadata/md5-cache/media-libs/libgii-1.0.2-r1
index 0b7a44f366a8..1119e7a6f5b6 100644
--- a/metadata/md5-cache/media-libs/libgii-1.0.2-r1
+++ b/metadata/md5-cache/media-libs/libgii-1.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=X? ( >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXxf86dga-1.1.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(-)?] )
 SLOT=0
 SRC_URI=mirror://sourceforge/ggi/libgii-1.0.2.src.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=5c20175e4ada0d98d473e23f2595127f
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.5.1-r1 b/metadata/md5-cache/media-libs/libgphoto2-2.5.5.1-r1
index 6c77dccf5408..33ad114c558f 100644
--- a/metadata/md5-cache/media-libs/libgphoto2-2.5.5.1-r1
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.5.5.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libxml2-2.9.1-r4:2[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(-)?] || ( dev-libs/libltdl: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(-)?] >=sys-devel/libtool-2.4.2-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(-)?] ) >=virtual/libusb-1-r1:1[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(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) exif? ( >=media-libs/libexif-0.6.21-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(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4[jpeg=,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(-)?] ) jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-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(-)?] ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[mdnsresponder-compat,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(-)?] ) !<sys-fs/udev-175 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0/6
 SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.5.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=22879923f344f1f3024f299dc535dbb5
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.7 b/metadata/md5-cache/media-libs/libgphoto2-2.5.7
index 863e9a197e26..1f1281c4801e 100644
--- a/metadata/md5-cache/media-libs/libgphoto2-2.5.7
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.5.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libxml2-2.9.1-r4:2[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(-)?] dev-libs/libltdl: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(-)?] >=virtual/libusb-1-r1:1[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(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[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(-)?] ) exif? ( >=media-libs/libexif-0.6.21-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(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4[jpeg=,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(-)?] ) jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-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(-)?] ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[mdnsresponder-compat,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(-)?] ) !<sys-fs/udev-175 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0/6
 SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.7.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=32804442490269e7068d5b2dccad1442
diff --git a/metadata/md5-cache/media-libs/libharu-2.3.0-r1 b/metadata/md5-cache/media-libs/libharu-2.3.0-r1
index 7f95527922f4..a67b3bfb4132 100644
--- a/metadata/md5-cache/media-libs/libharu-2.3.0-r1
+++ b/metadata/md5-cache/media-libs/libharu-2.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=png? ( >=media-libs/libpng-1.2.51[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(-)?] )
 SLOT=0/2.3.0
 SRC_URI=https://github.com/libharu/libharu/archive/RELEASE_2_3_0.tar.gz -> libharu-2.3.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=aefc52779723415d824786e9d600f3fd
diff --git a/metadata/md5-cache/media-libs/libid3tag-0.15.1b-r4 b/metadata/md5-cache/media-libs/libid3tag-0.15.1b-r4
index 15185ffe6b78..f7a6f5437f1e 100644
--- a/metadata/md5-cache/media-libs/libid3tag-0.15.1b-r4
+++ b/metadata/md5-cache/media-libs/libid3tag-0.15.1b-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r6 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/mad/libid3tag-0.15.1b.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a18bbca39563000d57833820297eebc1
diff --git a/metadata/md5-cache/media-libs/libiec61883-1.2.0-r1 b/metadata/md5-cache/media-libs/libiec61883-1.2.0-r1
index 353f9a373c32..931b0127254a 100644
--- a/metadata/md5-cache/media-libs/libiec61883-1.2.0-r1
+++ b/metadata/md5-cache/media-libs/libiec61883-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 GPL-2 )
 RDEPEND=>=sys-libs/libraw1394-2.1.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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://kernel/linux/libs/ieee1394/libiec61883-1.2.0.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
 _md5_=ab44e43f171a801e2e42d3b7dc1c078c
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.0-r3 b/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.0-r3
index d49469381e22..bad0b035134b 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.0-r3
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.0-r3
@@ -9,5 +9,5 @@ LICENSE=BSD IJG
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.3.0.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=65f286c208c0180d313ee9067a1debe6
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1 b/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1
index 83868aa8e666..b1513706b36b 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1
@@ -9,5 +9,5 @@ LICENSE=BSD IJG
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.3.1.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b951dba9a87c079de7e3876f1e59e34d
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1-r1 b/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1-r1
index 7e9ce471acca..76b261c72f60 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1-r1
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-1.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD IJG
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.3.1.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a11a7f3c323ebc235b23e5328f5636fe
diff --git a/metadata/md5-cache/media-libs/libjpeg-turbo-1.4.0 b/metadata/md5-cache/media-libs/libjpeg-turbo-1.4.0
index ca454ff636a6..0f146b67bd69 100644
--- a/metadata/md5-cache/media-libs/libjpeg-turbo-1.4.0
+++ b/metadata/md5-cache/media-libs/libjpeg-turbo-1.4.0
@@ -9,5 +9,5 @@ LICENSE=BSD IJG
 RDEPEND=!media-libs/jpeg:0 !media-libs/jpeg:62 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://sourceforge/libjpeg-turbo/libjpeg-turbo-1.4.0.tar.gz mirror://gentoo/libjpeg8_8d-2.debian.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=584c9e685aff92e9d65a391686baa889
diff --git a/metadata/md5-cache/media-libs/libmad-0.15.1b-r8 b/metadata/md5-cache/media-libs/libmad-0.15.1b-r8
index c3cf1e908356..9f2ae057df8c 100644
--- a/metadata/md5-cache/media-libs/libmad-0.15.1b-r8
+++ b/metadata/md5-cache/media-libs/libmad-0.15.1b-r8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/mad/libmad-0.15.1b.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=cb44240b3ba097424779facaa7752500
diff --git a/metadata/md5-cache/media-libs/libmetalink-0.1.1-r1 b/metadata/md5-cache/media-libs/libmetalink-0.1.1-r1
index 0e54a54f1209..f4c0cdd21a8f 100644
--- a/metadata/md5-cache/media-libs/libmetalink-0.1.1-r1
+++ b/metadata/md5-cache/media-libs/libmetalink-0.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=expat? ( >=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=^^ ( expat xml )
 SLOT=0
 SRC_URI=https://launchpad.net/libmetalink/trunk/libmetalink-0.1.1/+download/libmetalink-0.1.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1b2f408c82ed48e6fa4291844a1b16d0
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.3.5 b/metadata/md5-cache/media-libs/libmikmod-3.3.5
index 5171da8db10f..758b08438ff2 100644
--- a/metadata/md5-cache/media-libs/libmikmod-3.3.5
+++ b/metadata/md5-cache/media-libs/libmikmod-3.3.5
@@ -10,5 +10,5 @@ RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[abi_x86_32(-)?,abi_x86_64(-)?,a
 REQUIRED_USE=|| ( alsa oss coreaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/mikmod/libmikmod-3.3.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=975385bb720d93f99538e6ead8745d4b
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.3.6-r1 b/metadata/md5-cache/media-libs/libmikmod-3.3.6-r1
index a7088bcc9e53..facc9544503d 100644
--- a/metadata/md5-cache/media-libs/libmikmod-3.3.6-r1
+++ b/metadata/md5-cache/media-libs/libmikmod-3.3.6-r1
@@ -10,5 +10,5 @@ RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[abi_x86_32(-)?,abi_x86_64(-)?,a
 REQUIRED_USE=|| ( alsa coreaudio nas openal oss pulseaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/mikmod/libmikmod-3.3.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=fd59eb52dc49a2f6804395d8560bd8c2
diff --git a/metadata/md5-cache/media-libs/libmikmod-3.3.7 b/metadata/md5-cache/media-libs/libmikmod-3.3.7
index 846fc656f98c..887f0bbf41d9 100644
--- a/metadata/md5-cache/media-libs/libmikmod-3.3.7
+++ b/metadata/md5-cache/media-libs/libmikmod-3.3.7
@@ -10,5 +10,5 @@ RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2:=[abi_x86_32(-)?,abi_x86_64(-)?,a
 REQUIRED_USE=|| ( alsa coreaudio nas openal oss pulseaudio )
 SLOT=0
 SRC_URI=mirror://sourceforge/mikmod/libmikmod-3.3.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=3644f643012ca0dde83b2c758e41b558
diff --git a/metadata/md5-cache/media-libs/libmimic-1.0.4-r2 b/metadata/md5-cache/media-libs/libmimic-1.0.4-r2
index abaeff2cf6f3..c9874928e646 100644
--- a/metadata/md5-cache/media-libs/libmimic-1.0.4-r2
+++ b/metadata/md5-cache/media-libs/libmimic-1.0.4-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.34.3:2[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-medialibs-20130224-r8 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/farsight/libmimic-1.0.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=55deb656ba304b878c36e7a1c3293e6c
diff --git a/metadata/md5-cache/media-libs/libmms-0.6.2-r1 b/metadata/md5-cache/media-libs/libmms-0.6.2-r1
index 69c099e27c05..e2c8c68322cc 100644
--- a/metadata/md5-cache/media-libs/libmms-0.6.2-r1
+++ b/metadata/md5-cache/media-libs/libmms-0.6.2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.34.3:2[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-medialibs-20130224-r8 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/libmms/libmms-0.6.2.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=3d96d45b69fbd0b9746e43168f46af76
diff --git a/metadata/md5-cache/media-libs/libmms-0.6.4 b/metadata/md5-cache/media-libs/libmms-0.6.4
index b93b337c7033..c3b904c46dbf 100644
--- a/metadata/md5-cache/media-libs/libmms-0.6.4
+++ b/metadata/md5-cache/media-libs/libmms-0.6.4
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r8 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/libmms/libmms-0.6.4.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=891b4ea73bea20be41afd03b3393fa20
diff --git a/metadata/md5-cache/media-libs/libmng-2.0.2-r1 b/metadata/md5-cache/media-libs/libmng-2.0.2-r1
index be8014283cd7..c66012ce1e75 100644
--- a/metadata/md5-cache/media-libs/libmng-2.0.2-r1
+++ b/metadata/md5-cache/media-libs/libmng-2.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=libmng
 RDEPEND=>=virtual/jpeg-0-r2: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(-)?] >=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(-)?] lcms? ( >=media-libs/lcms-2.5:2[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-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/2
 SRC_URI=mirror://sourceforge/libmng/libmng-2.0.2.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a6cd18d400cf6b4a855b2e613b90fc56
diff --git a/metadata/md5-cache/media-libs/libmodplug-0.8.8.5 b/metadata/md5-cache/media-libs/libmodplug-0.8.8.5
index 0b780f9b935d..0d246faa6ea3 100644
--- a/metadata/md5-cache/media-libs/libmodplug-0.8.8.5
+++ b/metadata/md5-cache/media-libs/libmodplug-0.8.8.5
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/modplug-xmms/libmodplug-0.8.8.5.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=34c806b4caf107daaf89893f074b7b60
diff --git a/metadata/md5-cache/media-libs/libmpeg2-0.5.1-r2 b/metadata/md5-cache/media-libs/libmpeg2-0.5.1-r2
index c4ec461e8299..ba85cdc697fc 100644
--- a/metadata/md5-cache/media-libs/libmpeg2-0.5.1-r2
+++ b/metadata/md5-cache/media-libs/libmpeg2-0.5.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sdl? ( media-libs/libsdl ) X? ( x11-libs/libXv x11-libs/libICE x11-libs/libSM x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r9 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://libmpeg2.sourceforge.net/files/libmpeg2-0.5.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6fca45d28edd9a1e24fcd7f7d17bfdba
diff --git a/metadata/md5-cache/media-libs/libmpeg3-1.8-r1 b/metadata/md5-cache/media-libs/libmpeg3-1.8-r1
index 5bdbd944f60f..b7e70a7a0972 100644
--- a/metadata/md5-cache/media-libs/libmpeg3-1.8-r1
+++ b/metadata/md5-cache/media-libs/libmpeg3-1.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/zlib virtual/jpeg media-libs/a52dec
 SLOT=0
 SRC_URI=mirror://sourceforge/heroines/libmpeg3-1.8-src.tar.bz2 mirror://gentoo/libmpeg3-1.7-gentoo.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1e79c62ae147fd745d6327e98cc9bf72
diff --git a/metadata/md5-cache/media-libs/libnsbmp-0.1.1 b/metadata/md5-cache/media-libs/libnsbmp-0.1.1
index c79142c2cdc0..197fe809f199 100644
--- a/metadata/md5-cache/media-libs/libnsbmp-0.1.1
+++ b/metadata/md5-cache/media-libs/libnsbmp-0.1.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~m68k-mint
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libnsbmp-0.1.1-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.2.tar.gz -> netsurf-buildsystem-1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b5028b117be81ca4252c8fa6ff4645ca
diff --git a/metadata/md5-cache/media-libs/libnsbmp-0.1.2-r1 b/metadata/md5-cache/media-libs/libnsbmp-0.1.2-r1
index ee292e89840e..2c94391ca1e0 100644
--- a/metadata/md5-cache/media-libs/libnsbmp-0.1.2-r1
+++ b/metadata/md5-cache/media-libs/libnsbmp-0.1.2-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~m68k-mint
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libnsbmp-0.1.2-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.3.tar.gz -> netsurf-buildsystem-1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d566e0a090243eb6517c5e5fb4c7f2a2
diff --git a/metadata/md5-cache/media-libs/libnsgif-0.1.1 b/metadata/md5-cache/media-libs/libnsgif-0.1.1
index 504527a3e617..1a9bc7feecba 100644
--- a/metadata/md5-cache/media-libs/libnsgif-0.1.1
+++ b/metadata/md5-cache/media-libs/libnsgif-0.1.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~m68k-mint
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libnsgif-0.1.1-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.2.tar.gz -> netsurf-buildsystem-1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e06ea5987af707c1368ae0b9a0dd72c7
diff --git a/metadata/md5-cache/media-libs/libnsgif-0.1.2-r1 b/metadata/md5-cache/media-libs/libnsgif-0.1.2-r1
index ea47133db8c2..807f1b7ae264 100644
--- a/metadata/md5-cache/media-libs/libnsgif-0.1.2-r1
+++ b/metadata/md5-cache/media-libs/libnsgif-0.1.2-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~m68k-mint
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libnsgif-0.1.2-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.3.tar.gz -> netsurf-buildsystem-1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a5874cb57ba4f731c4465fefbfd752b0
diff --git a/metadata/md5-cache/media-libs/libofa-0.9.3-r1 b/metadata/md5-cache/media-libs/libofa-0.9.3-r1
index 0f1a73c7bed5..fd9146790191 100644
--- a/metadata/md5-cache/media-libs/libofa-0.9.3-r1
+++ b/metadata/md5-cache/media-libs/libofa-0.9.3-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( APL-1.0 GPL-2 )
 RDEPEND=dev-libs/expat net-misc/curl >=sci-libs/fftw-3.3.3-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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r2 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://musicip-libofa.googlecode.com/files/libofa-0.9.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ed6f0d8e56da1093ca4a051f4d4d2c13
diff --git a/metadata/md5-cache/media-libs/libogg-1.3.1 b/metadata/md5-cache/media-libs/libogg-1.3.1
index 9f85ad6748ea..d9a63952f90b 100644
--- a/metadata/md5-cache/media-libs/libogg-1.3.1
+++ b/metadata/md5-cache/media-libs/libogg-1.3.1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/ogg/libogg-1.3.1.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=076df7e4bdc17ce9fc688d3841d3b2a4
diff --git a/metadata/md5-cache/media-libs/libogg-1.3.2 b/metadata/md5-cache/media-libs/libogg-1.3.2
index 891137547894..2790a2c19d2e 100644
--- a/metadata/md5-cache/media-libs/libogg-1.3.2
+++ b/metadata/md5-cache/media-libs/libogg-1.3.2
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/ogg/libogg-1.3.2.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7dce30b12ba6a2df6695fc8d56249fbe
diff --git a/metadata/md5-cache/media-libs/libomxil-bellagio-0.9.3 b/metadata/md5-cache/media-libs/libomxil-bellagio-0.9.3
index c6131338a368..204c74643d14 100644
--- a/metadata/md5-cache/media-libs/libomxil-bellagio-0.9.3
+++ b/metadata/md5-cache/media-libs/libomxil-bellagio-0.9.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/omxil/libomxil-bellagio-0.9.3.tar.gz mirror://ubuntu/pool/universe/libo/libomxil-bellagio/libomxil-bellagio_0.9.3-1ubuntu2.debian.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=946b76eea81d682db9fa9700c074ba6c
diff --git a/metadata/md5-cache/media-libs/libpng-1.2.51 b/metadata/md5-cache/media-libs/libpng-1.2.51
index b56be5cfa5a6..2451044c5e53 100644
--- a/metadata/md5-cache/media-libs/libpng-1.2.51
+++ b/metadata/md5-cache/media-libs/libpng-1.2.51
@@ -9,5 +9,5 @@ LICENSE=libpng
 RDEPEND=>=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(-)?] !=media-libs/libpng-1.2*:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=1.2
 SRC_URI=mirror://sourceforge/libpng/libpng-1.2.51.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b028e860a49ef3524426dddf812e3336
diff --git a/metadata/md5-cache/media-libs/libpng-1.2.52 b/metadata/md5-cache/media-libs/libpng-1.2.52
index 78cbf95f6f21..4436ddb6e54c 100644
--- a/metadata/md5-cache/media-libs/libpng-1.2.52
+++ b/metadata/md5-cache/media-libs/libpng-1.2.52
@@ -9,5 +9,5 @@ LICENSE=libpng
 RDEPEND=>=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(-)?] !=media-libs/libpng-1.2*:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r3 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=1.2
 SRC_URI=mirror://sourceforge/libpng/libpng-1.2.52.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1eaebd2084cdac69e6976b5de3c3ba33
diff --git a/metadata/md5-cache/media-libs/libpng-1.5.21 b/metadata/md5-cache/media-libs/libpng-1.5.21
index 1c0f6d9602ff..e88424a4b60e 100644
--- a/metadata/md5-cache/media-libs/libpng-1.5.21
+++ b/metadata/md5-cache/media-libs/libpng-1.5.21
@@ -9,5 +9,5 @@ LICENSE=libpng
 RDEPEND=sys-libs/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(-)?] !=media-libs/libpng-1.5*:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=1.5
 SRC_URI=mirror://sourceforge/libpng/libpng-1.5.21.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.5.21-apng.patch.gz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=414ed9fc69a967625466d935a232e5ed
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.16 b/metadata/md5-cache/media-libs/libpng-1.6.16
index c808529416f4..1d186aece573 100644
--- a/metadata/md5-cache/media-libs/libpng-1.6.16
+++ b/metadata/md5-cache/media-libs/libpng-1.6.16
@@ -9,5 +9,5 @@ LICENSE=libpng
 RDEPEND=>=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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/16
 SRC_URI=mirror://sourceforge/libpng/libpng-1.6.16.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.6.16-apng.patch.gz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=16d607c34af3dc895964b56b09b46f14
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.17 b/metadata/md5-cache/media-libs/libpng-1.6.17
index bcfdad02cc08..e09dc6409071 100644
--- a/metadata/md5-cache/media-libs/libpng-1.6.17
+++ b/metadata/md5-cache/media-libs/libpng-1.6.17
@@ -9,5 +9,5 @@ LICENSE=libpng
 RDEPEND=>=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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/16
 SRC_URI=mirror://sourceforge/libpng/libpng-1.6.17.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.6.17-apng.patch.gz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=13eab3bf3cf3267dd24c61bcc2a5a5a2
diff --git a/metadata/md5-cache/media-libs/libpostproc-10.20140517-r1 b/metadata/md5-cache/media-libs/libpostproc-10.20140517-r1
index d0ac2f8d3db4..35e685b463e4 100644
--- a/metadata/md5-cache/media-libs/libpostproc-10.20140517-r1
+++ b/metadata/md5-cache/media-libs/libpostproc-10.20140517-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-video/libav-0.8.2-r2:0= !media-video/ffmpeg:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~lu_zero/distfiles/libpostproc-10.20140517.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=5b183fb8a4ba24b98156e8517151e3f8
diff --git a/metadata/md5-cache/media-libs/libpostproc-9999 b/metadata/md5-cache/media-libs/libpostproc-9999
index aa5aef03bdd0..c9fa2a589fd7 100644
--- a/metadata/md5-cache/media-libs/libpostproc-9999
+++ b/metadata/md5-cache/media-libs/libpostproc-9999
@@ -7,5 +7,5 @@ IUSE=pic static-libs cpu_flags_x86_3dnow altivec cpu_flags_x86_mmx cpu_flags_x86
 LICENSE=GPL-2
 RDEPEND=>=media-video/libav-0.8.2-r2:0= !media-video/ffmpeg:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b38d35cebe1c230f5a334e402ac900e3
diff --git a/metadata/md5-cache/media-libs/libquicktime-1.2.4-r1 b/metadata/md5-cache/media-libs/libquicktime-1.2.4-r1
index c3184131371c..88021076ef67 100644
--- a/metadata/md5-cache/media-libs/libquicktime-1.2.4-r1
+++ b/metadata/md5-cache/media-libs/libquicktime-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 REQUIRED_USE=opengl? ( X )
 SLOT=0
 SRC_URI=mirror://sourceforge/libquicktime/libquicktime-1.2.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=98538030dde2ac6702444e233aa178eb
diff --git a/metadata/md5-cache/media-libs/libquvi-0.4.1-r2 b/metadata/md5-cache/media-libs/libquvi-0.4.1-r2
index c6e160d1cd12..8a16dcde85b0 100644
--- a/metadata/md5-cache/media-libs/libquvi-0.4.1-r2
+++ b/metadata/md5-cache/media-libs/libquvi-0.4.1-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=net-misc/curl-7.36.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(-)?] !<media-libs/quvi-0.4.0 >=media-libs/libquvi-scripts-0.4.21-r1:0.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(-)?] >=dev-lang/lua-5.1.5-r3[deprecated,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(-)?] !=media-libs/libquvi-0.4*:0
 SLOT=0.4
 SRC_URI=mirror://sourceforge/quvi/0.4/libquvi-0.4.1.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c8eb20c80651f399295aea0940996469
diff --git a/metadata/md5-cache/media-libs/libquvi-0.9.4-r1 b/metadata/md5-cache/media-libs/libquvi-0.9.4-r1
index 6e105d17db89..c1ca8f4e9c57 100644
--- a/metadata/md5-cache/media-libs/libquvi-0.9.4-r1
+++ b/metadata/md5-cache/media-libs/libquvi-0.9.4-r1
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=!<media-libs/quvi-0.4.0 >=dev-libs/glib-2.34.3:2[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(-)?] >=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(-)?] >=media-libs/libquvi-scripts-0.9.20130903[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(-)?] >=net-libs/libproxy-0.4.11-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(-)?] >=net-misc/curl-7.36.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(-)?] >=dev-lang/lua-5.1.5-r3[deprecated,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(-)?] nls? ( >=virtual/libintl-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/8
 SRC_URI=mirror://sourceforge/quvi/0.9/libquvi-0.9.4.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2258322842fcaf70e460c368b12ef780
diff --git a/metadata/md5-cache/media-libs/libquvi-scripts-0.4.21-r2 b/metadata/md5-cache/media-libs/libquvi-scripts-0.4.21-r2
index 9c5863f2c6db..c680076cb5f4 100644
--- a/metadata/md5-cache/media-libs/libquvi-scripts-0.4.21-r2
+++ b/metadata/md5-cache/media-libs/libquvi-scripts-0.4.21-r2
@@ -10,5 +10,5 @@ RDEPEND=!=media-libs/libquvi-scripts-0.4*:0
 RESTRICT=test
 SLOT=0.4
 SRC_URI=mirror://sourceforge/quvi/0.4/libquvi-scripts-0.4.21.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6fe217117ac9f83e206c0bbf178fc245
diff --git a/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r1 b/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r1
index 0e9bc898e338..bc9a3a7440a1 100644
--- a/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r1
+++ b/metadata/md5-cache/media-libs/libquvi-scripts-0.9.20131130-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lua/LuaBitOp-1.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/quvi/libquvi-scripts-0.9.20131130.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c6a05daecd1d7d09d926a4113e3085f5
diff --git a/metadata/md5-cache/media-libs/libraw-0.16.0-r1 b/metadata/md5-cache/media-libs/libraw-0.16.0-r1
index 851581dd9020..c18928190c2b 100644
--- a/metadata/md5-cache/media-libs/libraw-0.16.0-r1
+++ b/metadata/md5-cache/media-libs/libraw-0.16.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 CDDL GPL-2 GPL-3
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6[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(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[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/10
 SRC_URI=http://www.libraw.org/data/LibRaw-0.16.0.tar.gz demosaic? ( http://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-0.16.0.tar.gz http://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-0.16.0.tar.gz )
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c1d0bdce184a1427867e73a8efee2713
diff --git a/metadata/md5-cache/media-libs/libraw-0.16.0_beta1-r1 b/metadata/md5-cache/media-libs/libraw-0.16.0_beta1-r1
index 6a6c605a4395..8e106e23adf5 100644
--- a/metadata/md5-cache/media-libs/libraw-0.16.0_beta1-r1
+++ b/metadata/md5-cache/media-libs/libraw-0.16.0_beta1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 CDDL GPL-2 GPL-3
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6[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(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[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/10
 SRC_URI=http://www.libraw.org/data/LibRaw-0.16.0-Beta1.tar.gz demosaic? ( http://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-0.16.0-Beta1.tar.gz http://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-0.16.0-Beta1.tar.gz )
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=01afc3674cd56e94fa89808e8c6a4adc
diff --git a/metadata/md5-cache/media-libs/libreplaygain-477-r1 b/metadata/md5-cache/media-libs/libreplaygain-477-r1
index a87f6bb4c426..f9a1e61fa69b 100644
--- a/metadata/md5-cache/media-libs/libreplaygain-477-r1
+++ b/metadata/md5-cache/media-libs/libreplaygain-477-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r2 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ssuominen/libreplaygain-477.tar.xz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=57879aba0812a14401a35be0ea9dac92
diff --git a/metadata/md5-cache/media-libs/librosprite-0.1.1 b/metadata/md5-cache/media-libs/librosprite-0.1.1
index 21e4b9ffb7c9..3327b711f063 100644
--- a/metadata/md5-cache/media-libs/librosprite-0.1.1
+++ b/metadata/md5-cache/media-libs/librosprite-0.1.1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~m68k-mint
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/librosprite-0.1.1-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.2.tar.gz -> netsurf-buildsystem-1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=28918e32290324e370396903f9bdd6bc
diff --git a/metadata/md5-cache/media-libs/librosprite-0.1.2-r1 b/metadata/md5-cache/media-libs/librosprite-0.1.2-r1
index 2984965e24b3..af966b00252e 100644
--- a/metadata/md5-cache/media-libs/librosprite-0.1.2-r1
+++ b/metadata/md5-cache/media-libs/librosprite-0.1.2-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~m68k-mint
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/librosprite-0.1.2-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.3.tar.gz -> netsurf-buildsystem-1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7d61a248180d4f9e678bb74c0ba54c84
diff --git a/metadata/md5-cache/media-libs/libsamplerate-0.1.8-r1 b/metadata/md5-cache/media-libs/libsamplerate-0.1.8-r1
index 7a28bbd1e51f..045ac4f4e4cd 100644
--- a/metadata/md5-cache/media-libs/libsamplerate-0.1.8-r1
+++ b/metadata/md5-cache/media-libs/libsamplerate-0.1.8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sndfile? ( >=media-libs/libsndfile-1.0.2 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r6 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.mega-nerd.com/SRC/libsamplerate-0.1.8.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=3261fae2440873c734eb9bda9836d69e
diff --git a/metadata/md5-cache/media-libs/libsdl-1.2.15-r8 b/metadata/md5-cache/media-libs/libsdl-1.2.15-r8
index c9598cc3c1b7..ae7f67feb90e 100644
--- a/metadata/md5-cache/media-libs/libsdl-1.2.15-r8
+++ b/metadata/md5-cache/media-libs/libsdl-1.2.15-r8
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-sdl-20140406 ) sound? ( >=media-libs/audiofile-0.3.5[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(-)?] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[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(-)?] ) nas? ( >=media-libs/nas-1.9.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(-)?] >=x11-libs/libXt-1.1.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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] ) X? ( >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXrandr-1.4.2[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(-)?] ) aalib? ( >=media-libs/aalib-1.4_rc5-r6[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(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) opengl? ( >=virtual/opengl-7.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(-)?] >=virtual/glu-9.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(-)?] ) tslib? ( >=x11-libs/tslib-1.0-r3[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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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
 SRC_URI=http://www.libsdl.org/release/SDL-1.2.15.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2bb678eaf2cdfbb5ac52d8e0a36276fc
diff --git a/metadata/md5-cache/media-libs/libsdl-1.2.15-r9 b/metadata/md5-cache/media-libs/libsdl-1.2.15-r9
index ada07abc4c2e..be56e560a445 100644
--- a/metadata/md5-cache/media-libs/libsdl-1.2.15-r9
+++ b/metadata/md5-cache/media-libs/libsdl-1.2.15-r9
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-sdl-20140406 ) sound? ( >=media-libs/audiofile-0.3.5[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(-)?] ) alsa? ( >=media-libs/alsa-lib-1.0.27.2[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(-)?] ) nas? ( >=media-libs/nas-1.9.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(-)?] >=x11-libs/libXt-1.1.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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] ) X? ( >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXrandr-1.4.2[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(-)?] ) aalib? ( >=media-libs/aalib-1.4_rc5-r6[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(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) opengl? ( >=virtual/opengl-7.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(-)?] >=virtual/glu-9.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(-)?] ) tslib? ( >=x11-libs/tslib-1.0-r3[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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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
 SRC_URI=http://www.libsdl.org/release/SDL-1.2.15.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8ad489de6a2a3b344c07df08e786a35f
diff --git a/metadata/md5-cache/media-libs/libsdl2-2.0.3-r200 b/metadata/md5-cache/media-libs/libsdl2-2.0.3-r200
index fa252b5da5e9..ed3250c3aab4 100644
--- a/metadata/md5-cache/media-libs/libsdl2-2.0.3-r200
+++ b/metadata/md5-cache/media-libs/libsdl2-2.0.3-r200
@@ -10,5 +10,5 @@ RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi
 REQUIRED_USE=alsa? ( sound ) fusionsound? ( sound ) gles? ( video ) nas? ( sound ) opengl? ( video ) pulseaudio? ( sound ) xinerama? ( X ) xscreensaver? ( X )
 SLOT=0
 SRC_URI=http://www.libsdl.org/release/SDL2-2.0.3.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=27bf819d8340ce438f14d49025f8217a
diff --git a/metadata/md5-cache/media-libs/libshout-2.3.1-r1 b/metadata/md5-cache/media-libs/libshout-2.3.1-r1
index 498ecac5c0de..8f92b9453cad 100644
--- a/metadata/md5-cache/media-libs/libshout-2.3.1-r1
+++ b/metadata/md5-cache/media-libs/libshout-2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=media-libs/libogg-1.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(-)?] >=media-libs/libvorbis-1.3.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(-)?] speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[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-medialibs-20130224-r6 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/libshout/libshout-2.3.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d13c694cb7ae085c0e25b1fdffc65fb4
diff --git a/metadata/md5-cache/media-libs/libsidplay-1.36.59-r1 b/metadata/md5-cache/media-libs/libsidplay-1.36.59-r1
index de0b80a0cfb1..9b65310c7979 100644
--- a/metadata/md5-cache/media-libs/libsidplay-1.36.59-r1
+++ b/metadata/md5-cache/media-libs/libsidplay-1.36.59-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r6 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=1
 SRC_URI=http://critical.ch/distfiles/libsidplay-1.36.59.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=883ee3dba7b47f52b54c58f6bca67a15
diff --git a/metadata/md5-cache/media-libs/libsidplay-2.1.1-r4 b/metadata/md5-cache/media-libs/libsidplay-2.1.1-r4
index c811bd18154e..0974ae84e6b2 100644
--- a/metadata/md5-cache/media-libs/libsidplay-2.1.1-r4
+++ b/metadata/md5-cache/media-libs/libsidplay-2.1.1-r4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r6 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=mirror://sourceforge/sidplay2/sidplay-libs-2.1.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6ac92809ad00cc17fd9576c199e5e104
diff --git a/metadata/md5-cache/media-libs/libsixel-1.4.7 b/metadata/md5-cache/media-libs/libsixel-1.4.12
similarity index 73%
rename from metadata/md5-cache/media-libs/libsixel-1.4.7
rename to metadata/md5-cache/media-libs/libsixel-1.4.12
index 0a3c8d6c2d30..afdd428c7801 100644
--- a/metadata/md5-cache/media-libs/libsixel-1.4.7
+++ b/metadata/md5-cache/media-libs/libsixel-1.4.12
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install test
-DEPEND=curl? ( net-misc/curl ) gd? ( media-libs/gd ) gtk? ( x11-libs/gdk-pixbuf:2 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng ) zsh-completion? ( app-shells/zsh ) virtual/pkgconfig
+DEPEND=curl? ( net-misc/curl ) gd? ( media-libs/gd ) gtk? ( x11-libs/gdk-pixbuf:2 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) zsh-completion? ( app-shells/zsh ) virtual/pkgconfig
 DESCRIPTION=A lightweight, fast implementation of DEC SIXEL graphics codec
 EAPI=5
 HOMEPAGE=https://github.com/saitoha/libsixel
 IUSE=curl gd gtk jpeg png zsh-completion
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT public-domain
-RDEPEND=curl? ( net-misc/curl ) gd? ( media-libs/gd ) gtk? ( x11-libs/gdk-pixbuf:2 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng ) zsh-completion? ( app-shells/zsh )
+RDEPEND=curl? ( net-misc/curl ) gd? ( media-libs/gd ) gtk? ( x11-libs/gdk-pixbuf:2 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) zsh-completion? ( app-shells/zsh )
 SLOT=0
-SRC_URI=https://github.com/saitoha/libsixel/archive/v1.4.7.tar.gz -> libsixel-1.4.7.tar.gz
+SRC_URI=https://github.com/saitoha/libsixel/archive/v1.4.12.tar.gz -> libsixel-1.4.12.tar.gz
 _eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=e55666f39e16db18db4e26d9d2341dca
+_md5_=7e775a8d6ac5e49677dc9a96b14b66f9
diff --git a/metadata/md5-cache/media-libs/libsndfile-1.0.25-r1 b/metadata/md5-cache/media-libs/libsndfile-1.0.25-r1
index 5048a7a6afa8..12dabda40963 100644
--- a/metadata/md5-cache/media-libs/libsndfile-1.0.25-r1
+++ b/metadata/md5-cache/media-libs/libsndfile-1.0.25-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=!minimal? ( >=media-libs/flac-1.2.1-r5[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(-)?] >=media-libs/libogg-1.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(-)?] >=media-libs/libvorbis-1.3.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(-)?] ) alsa? ( media-libs/alsa-lib ) sqlite? ( >=dev-db/sqlite-3.2 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r6 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.25.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0714865ef23a9cd12bfbf6524b105307
diff --git a/metadata/md5-cache/media-libs/libsoundtouch-1.8.0-r1 b/metadata/md5-cache/media-libs/libsoundtouch-1.8.0-r1
index 819b207e7d78..51bb3ef8339f 100644
--- a/metadata/md5-cache/media-libs/libsoundtouch-1.8.0-r1
+++ b/metadata/md5-cache/media-libs/libsoundtouch-1.8.0-r1
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm hppa ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.surina.net/soundtouch/soundtouch-1.8.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d8df786a4012e606507f3f92963f9c39
diff --git a/metadata/md5-cache/media-libs/libsoundtouch-1.9.0 b/metadata/md5-cache/media-libs/libsoundtouch-1.9.0
index 9b0a100dd373..9a3fd3ab16e5 100644
--- a/metadata/md5-cache/media-libs/libsoundtouch-1.9.0
+++ b/metadata/md5-cache/media-libs/libsoundtouch-1.9.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-m
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.surina.net/soundtouch/soundtouch-1.9.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=91aab32ac82ecce282ae33d5a20282e1
diff --git a/metadata/md5-cache/media-libs/libsvgtiny-0.1.2 b/metadata/md5-cache/media-libs/libsvgtiny-0.1.2
index 527b15d5cf9e..f4223a5d9b45 100644
--- a/metadata/md5-cache/media-libs/libsvgtiny-0.1.2
+++ b/metadata/md5-cache/media-libs/libsvgtiny-0.1.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=net-libs/libdom-0.1.1[xml,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(-)?] >=dev-libs/libwapcaplet-0.2.1-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(-)?]
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libsvgtiny-0.1.2-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.2.tar.gz -> netsurf-buildsystem-1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=208cd7a51f5189c11d52729cfd586b09
diff --git a/metadata/md5-cache/media-libs/libsvgtiny-0.1.3-r1 b/metadata/md5-cache/media-libs/libsvgtiny-0.1.3-r1
index 9d99bed7f693..5ce3476502b9 100644
--- a/metadata/md5-cache/media-libs/libsvgtiny-0.1.3-r1
+++ b/metadata/md5-cache/media-libs/libsvgtiny-0.1.3-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=net-libs/libdom-0.1.2-r1[xml,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(-)?] >=dev-libs/libwapcaplet-0.2.2-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(-)?]
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libsvgtiny-0.1.3-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.3.tar.gz -> netsurf-buildsystem-1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=adc3327913c6b76af81f2a0516c34d5f
diff --git a/metadata/md5-cache/media-libs/libtheora-1.1.1-r1 b/metadata/md5-cache/media-libs/libtheora-1.1.1-r1
index 7760acb138a8..dbd062eef8d8 100644
--- a/metadata/md5-cache/media-libs/libtheora-1.1.1-r1
+++ b/metadata/md5-cache/media-libs/libtheora-1.1.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libogg-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 REQUIRED_USE=examples? ( encode )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b10100e09a212ed166e7c7a667882676
diff --git a/metadata/md5-cache/media-libs/libtimidity-0.1.0-r2 b/metadata/md5-cache/media-libs/libtimidity-0.1.0-r2
index fc4b5e77080d..80cdba839893 100644
--- a/metadata/md5-cache/media-libs/libtimidity-0.1.0-r2
+++ b/metadata/md5-cache/media-libs/libtimidity-0.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=ao? ( >=media-libs/libao-1.1.0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/libtimidity/libtimidity-0.1.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=016c3b16b02f0684201f941914abbd15
diff --git a/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r1 b/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r1
index 3b69394236a7..f17b2d812536 100644
--- a/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r1
+++ b/metadata/md5-cache/media-libs/libtxc_dxtn-1.0.1-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/mesa
 RESTRICT=bindist
 SLOT=0
 SRC_URI=http://people.freedesktop.org/~cbrill/libtxc_dxtn/libtxc_dxtn-1.0.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b7faa049c792a08917315c984701ce27
diff --git a/metadata/md5-cache/media-libs/libv4l-0.9.5-r1 b/metadata/md5-cache/media-libs/libv4l-0.9.5-r1
index 02f47e41aedd..46a0ed134f39 100644
--- a/metadata/md5-cache/media-libs/libv4l-0.9.5-r1
+++ b/metadata/md5-cache/media-libs/libv4l-0.9.5-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/jpeg-0-r2: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(-)?] virtual/glu virtual/opengl x11-libs/libX11:= !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r5 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://linuxtv.org/downloads/v4l-utils/v4l-utils-0.9.5.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0c6af550844f41093b50d56e25bbd321
diff --git a/metadata/md5-cache/media-libs/libv4l-1.0.0 b/metadata/md5-cache/media-libs/libv4l-1.0.0
index 82fa12eb6e8e..aa1a5f63010e 100644
--- a/metadata/md5-cache/media-libs/libv4l-1.0.0
+++ b/metadata/md5-cache/media-libs/libv4l-1.0.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/jpeg-0-r2: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(-)?] virtual/glu virtual/opengl x11-libs/libX11:= !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r5 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://linuxtv.org/downloads/v4l-utils/v4l-utils-1.0.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=78f4ee39eb8badfc650c168e1aa68322
diff --git a/metadata/md5-cache/media-libs/libv4l-1.2.1 b/metadata/md5-cache/media-libs/libv4l-1.2.1
index 09422e505206..f36070869fb5 100644
--- a/metadata/md5-cache/media-libs/libv4l-1.2.1
+++ b/metadata/md5-cache/media-libs/libv4l-1.2.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/jpeg-0-r2: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(-)?] virtual/glu virtual/opengl x11-libs/libX11:= !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r5 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://linuxtv.org/downloads/v4l-utils/v4l-utils-1.2.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=79bd6cf09f1f3aa6fa1e300ca82f6945
diff --git a/metadata/md5-cache/media-libs/libv4l-1.6.0 b/metadata/md5-cache/media-libs/libv4l-1.6.0
index 7cf5db136112..200aadcb672c 100644
--- a/metadata/md5-cache/media-libs/libv4l-1.6.0
+++ b/metadata/md5-cache/media-libs/libv4l-1.6.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/jpeg-0-r2: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(-)?] virtual/glu virtual/opengl x11-libs/libX11:= !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r5 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://linuxtv.org/downloads/v4l-utils/v4l-utils-1.6.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cea9e18d353becc522a88f873830b49b
diff --git a/metadata/md5-cache/media-libs/libv4l-1.6.0-r1 b/metadata/md5-cache/media-libs/libv4l-1.6.0-r1
index 571a820895c9..71e6dab91bde 100644
--- a/metadata/md5-cache/media-libs/libv4l-1.6.0-r1
+++ b/metadata/md5-cache/media-libs/libv4l-1.6.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r5 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://linuxtv.org/downloads/v4l-utils/v4l-utils-1.6.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c8f1f164f12a52684e5b0c03d1d198f0
diff --git a/metadata/md5-cache/media-libs/libv4l-1.6.2 b/metadata/md5-cache/media-libs/libv4l-1.6.2
index 1d1a9bf59a0c..a993315b937b 100644
--- a/metadata/md5-cache/media-libs/libv4l-1.6.2
+++ b/metadata/md5-cache/media-libs/libv4l-1.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=Separate libraries ebuild from upstream v4l-utils package
 EAPI=5
 HOMEPAGE=http://git.linuxtv.org/v4l-utils.git
 IUSE=jpeg 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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=LGPL-2.1+
 RDEPEND=jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2 abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r5 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://linuxtv.org/downloads/v4l-utils/v4l-utils-1.6.2.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a31883582196983aa789d62e4085614a
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=1d5e8979f6956ef6b5b714cecdc00434
diff --git a/metadata/md5-cache/media-libs/libvisual-0.4.0-r3 b/metadata/md5-cache/media-libs/libvisual-0.4.0-r3
index 6d652d3349bd..4afa584b6457 100644
--- a/metadata/md5-cache/media-libs/libvisual-0.4.0-r3
+++ b/metadata/md5-cache/media-libs/libvisual-0.4.0-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r9 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0.4
 SRC_URI=mirror://sourceforge/libvisual/libvisual-0.4.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=dcb3a9fa6c2481741abe98a078d2ed50
diff --git a/metadata/md5-cache/media-libs/libvorbis-1.3.3-r1 b/metadata/md5-cache/media-libs/libvorbis-1.3.3-r1
index cdb2874951e8..2b9ff06df414 100644
--- a/metadata/md5-cache/media-libs/libvorbis-1.3.3-r1
+++ b/metadata/md5-cache/media-libs/libvorbis-1.3.3-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=media-libs/libogg-1.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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.3.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f11516368d9a62e7b366cf829e7e0481
diff --git a/metadata/md5-cache/media-libs/libvorbis-1.3.4 b/metadata/md5-cache/media-libs/libvorbis-1.3.4
index 416be8d1e57f..91600679bc9b 100644
--- a/metadata/md5-cache/media-libs/libvorbis-1.3.4
+++ b/metadata/md5-cache/media-libs/libvorbis-1.3.4
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=media-libs/libogg-1.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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.4.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7c1bb8d6e21c5733cd3a5a7d8b33f108
diff --git a/metadata/md5-cache/media-libs/libvorbis-1.3.5 b/metadata/md5-cache/media-libs/libvorbis-1.3.5
index 24c2a959c8b3..96034447a882 100644
--- a/metadata/md5-cache/media-libs/libvorbis-1.3.5
+++ b/metadata/md5-cache/media-libs/libvorbis-1.3.5
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=media-libs/libogg-1.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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.5.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=81ff3ca0e24938dd0234ccdc9ef1a534
diff --git a/metadata/md5-cache/media-libs/libvpx-1.2.0_pre20130625 b/metadata/md5-cache/media-libs/libvpx-1.2.0_pre20130625
index e4fb74e472c9..7245506bee2a 100644
--- a/metadata/md5-cache/media-libs/libvpx-1.2.0_pre20130625
+++ b/metadata/md5-cache/media-libs/libvpx-1.2.0_pre20130625
@@ -10,5 +10,5 @@ RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
 SLOT=0
 SRC_URI=mirror://gentoo/libvpx-1.2.0_pre20130625.tar.bz2 test? ( mirror://gentoo/libvpx-testdata-1.2.0.tar.bz2 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b844fa219704b31e52c72fdfdb6eecec
diff --git a/metadata/md5-cache/media-libs/libvpx-1.3.0 b/metadata/md5-cache/media-libs/libvpx-1.3.0
index 4ccb23a14f50..e6b490a1f9df 100644
--- a/metadata/md5-cache/media-libs/libvpx-1.3.0
+++ b/metadata/md5-cache/media-libs/libvpx-1.3.0
@@ -10,5 +10,5 @@ RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
 SLOT=0
 SRC_URI=http://webm.googlecode.com/files/libvpx-v1.3.0.tar.bz2 test? ( mirror://gentoo/libvpx-testdata-1.3.0.tar.bz2 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=06a9b5151cbac976dff8421cca612a44
diff --git a/metadata/md5-cache/media-libs/libvpx-1.4.0 b/metadata/md5-cache/media-libs/libvpx-1.4.0
index c8fb98b3d74b..5424b87cdb08 100644
--- a/metadata/md5-cache/media-libs/libvpx-1.4.0
+++ b/metadata/md5-cache/media-libs/libvpx-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
 SLOT=0/2
 SRC_URI=http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-1.4.0.tar.bz2 test? ( mirror://gentoo/libvpx-testdata-1.4.0.tar.bz2 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d969e1d1f98bfec32d318bd7e3e3231a
diff --git a/metadata/md5-cache/media-libs/libwebp-0.3.0 b/metadata/md5-cache/media-libs/libwebp-0.3.0
index 9debffb6c9c5..81403a4109bb 100644
--- a/metadata/md5-cache/media-libs/libwebp-0.3.0
+++ b/metadata/md5-cache/media-libs/libwebp-0.3.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= )
 SLOT=0
 SRC_URI=http://webp.googlecode.com/files/libwebp-0.3.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=86ef3631561f91b99af51a7286fbdd04
diff --git a/metadata/md5-cache/media-libs/libwebp-0.3.1 b/metadata/md5-cache/media-libs/libwebp-0.3.1
index f8d579591e14..2073428899da 100644
--- a/metadata/md5-cache/media-libs/libwebp-0.3.1
+++ b/metadata/md5-cache/media-libs/libwebp-0.3.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=gif? ( media-libs/giflib:= ) jpeg? ( virtual/jpeg:0= ) opengl? ( media-libs/freeglut virtual/opengl ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= )
 SLOT=0
 SRC_URI=http://webp.googlecode.com/files/libwebp-0.3.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b0dd5f8e607670bbbff78af83e48bb4e
diff --git a/metadata/md5-cache/media-libs/libwebp-0.4.0 b/metadata/md5-cache/media-libs/libwebp-0.4.0
index 41c2acc74fce..80408e0caad7 100644
--- a/metadata/md5-cache/media-libs/libwebp-0.4.0
+++ b/metadata/md5-cache/media-libs/libwebp-0.4.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=gif? ( media-libs/giflib:= ) jpeg? ( virtual/jpeg:0= ) opengl? ( media-libs/freeglut virtual/opengl ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= )
 SLOT=0/5
 SRC_URI=http://webp.googlecode.com/files/libwebp-0.4.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=656632866d3de9e9f0bc6d31fe10f6d0
diff --git a/metadata/md5-cache/media-libs/libwebp-0.4.2 b/metadata/md5-cache/media-libs/libwebp-0.4.2
index 6d02aaa91cc5..fd9af0636630 100644
--- a/metadata/md5-cache/media-libs/libwebp-0.4.2
+++ b/metadata/md5-cache/media-libs/libwebp-0.4.2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=gif? ( media-libs/giflib:= ) jpeg? ( virtual/jpeg:0= ) opengl? ( media-libs/freeglut virtual/opengl ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= )
 SLOT=0/5
 SRC_URI=http://downloads.webmproject.org/releases/webp/libwebp-0.4.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=09c769ec638a6014ce7c02bbc3020977
diff --git a/metadata/md5-cache/media-libs/lv2-1.10.0-r1 b/metadata/md5-cache/media-libs/lv2-1.10.0-r1
index d6084d81b42c..9c32daaa1966 100644
--- a/metadata/md5-cache/media-libs/lv2-1.10.0-r1
+++ b/metadata/md5-cache/media-libs/lv2-1.10.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=LV2 is a simple but extensible successor of LADSPA
 EAPI=5
 HOMEPAGE=http://lv2plug.in/
 IUSE=doc plugins 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 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=MIT
 RDEPEND=plugins? ( x11-libs/gtk+:2 media-libs/libsndfile ) dev-python/lxml[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(+)?] dev-python/pygments[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(+)?] dev-python/rdflib[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(+)?] !<media-libs/slv2-0.4.2 !media-libs/lv2core !media-libs/lv2-ui
 SLOT=0
 SRC_URI=http://lv2plug.in/spec/lv2-1.10.0.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
-_md5_=3e7c6be169dab782291c760537fcf960
+_md5_=49ab4c77dfb9df3414631c58da7cdfb3
diff --git a/metadata/md5-cache/media-libs/mesa-10.2.8 b/metadata/md5-cache/media-libs/mesa-10.2.8
index 1967be0ebc5a..0a517e468ecc 100644
--- a/metadata/md5-cache/media-libs/mesa-10.2.8
+++ b/metadata/md5-cache/media-libs/mesa-10.2.8
@@ -11,5 +11,5 @@ REQUIRED_USE=llvm? ( gallium ) openvg? ( egl gallium ) opencl? ( gallium llvm )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/10.2.8/MesaLib-10.2.8.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d07f6ea9c243da3a7325f25bbb2f45a4
diff --git a/metadata/md5-cache/media-libs/mesa-10.3.7-r1 b/metadata/md5-cache/media-libs/mesa-10.3.7-r1
index 4f3cd69b20a8..95e96ab874a0 100644
--- a/metadata/md5-cache/media-libs/mesa-10.3.7-r1
+++ b/metadata/md5-cache/media-libs/mesa-10.3.7-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=llvm? ( gallium ) openvg? ( egl gallium ) opencl? ( gallium llvm )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/10.3.7/MesaLib-10.3.7.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=af2c89a2dd78d48898bab50e5a52762c
diff --git a/metadata/md5-cache/media-libs/mesa-10.3.7-r2 b/metadata/md5-cache/media-libs/mesa-10.3.7-r2
index 5ec36ce450de..90a7c7e65378 100644
--- a/metadata/md5-cache/media-libs/mesa-10.3.7-r2
+++ b/metadata/md5-cache/media-libs/mesa-10.3.7-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=llvm? ( gallium ) openvg? ( egl gallium ) opencl? ( gallium llvm )
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/10.3.7/MesaLib-10.3.7.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d455e1405c5a4617c9d0cab5fdd86d86
diff --git a/metadata/md5-cache/media-libs/mesa-10.4.6 b/metadata/md5-cache/media-libs/mesa-10.4.6
index bde4f326cc47..839521841eef 100644
--- a/metadata/md5-cache/media-libs/mesa-10.4.6
+++ b/metadata/md5-cache/media-libs/mesa-10.4.6
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) o
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/10.4.6/MesaLib-10.4.6.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7d287e933091320f4c1ea2b2085b1f8c
diff --git a/metadata/md5-cache/media-libs/mesa-10.5.4 b/metadata/md5-cache/media-libs/mesa-10.5.4
index c2ae07f17995..4adc9fd8ed26 100644
--- a/metadata/md5-cache/media-libs/mesa-10.5.4
+++ b/metadata/md5-cache/media-libs/mesa-10.5.4
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) o
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/10.5.4/mesa-10.5.4.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=99635423b976499122f14957069dc0ad
diff --git a/metadata/md5-cache/media-libs/mesa-10.5.5 b/metadata/md5-cache/media-libs/mesa-10.5.5
index 3625476e6f34..d258c12be1f8 100644
--- a/metadata/md5-cache/media-libs/mesa-10.5.5
+++ b/metadata/md5-cache/media-libs/mesa-10.5.5
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) o
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/10.5.5/mesa-10.5.5.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=85015d9aaa945876e6b3a838b724c9d9
diff --git a/metadata/md5-cache/media-libs/mesa-10.5.6 b/metadata/md5-cache/media-libs/mesa-10.5.6
index d8dd6f30ea27..14450e14aaa2 100644
--- a/metadata/md5-cache/media-libs/mesa-10.5.6
+++ b/metadata/md5-cache/media-libs/mesa-10.5.6
@@ -11,5 +11,5 @@ REQUIRED_USE=d3d9? ( dri3 gallium ) llvm? ( gallium ) opencl? ( gallium llvm ) o
 RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/10.5.6/mesa-10.5.6.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d2f80c9d5c98edc0b1f4bf3839bb38f2
diff --git a/metadata/md5-cache/media-libs/nas-1.9.4 b/metadata/md5-cache/media-libs/nas-1.9.4
index 78e8ce08d9c7..907571a76feb 100644
--- a/metadata/md5-cache/media-libs/nas-1.9.4
+++ b/metadata/md5-cache/media-libs/nas-1.9.4
@@ -9,5 +9,5 @@ LICENSE=HPND MIT
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXau-1.0.7-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(-)?] x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm >=x11-libs/libXt-1.1.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(-)?]
 SLOT=0
 SRC_URI=mirror://sourceforge/nas/nas-1.9.4.src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4ec009d3abbaa81551f1d275695325fd
diff --git a/metadata/md5-cache/media-libs/nas-1.9.4-r1 b/metadata/md5-cache/media-libs/nas-1.9.4-r1
index b6a815a5f9d0..fe0ba44779df 100644
--- a/metadata/md5-cache/media-libs/nas-1.9.4-r1
+++ b/metadata/md5-cache/media-libs/nas-1.9.4-r1
@@ -9,5 +9,5 @@ LICENSE=HPND MIT
 RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXau-1.0.7-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(-)?] x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXpm >=x11-libs/libXt-1.1.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(-)?]
 SLOT=0
 SRC_URI=mirror://sourceforge/nas/nas-1.9.4.src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=56b0e48b969ad8d97a69957351c1d61f
diff --git a/metadata/md5-cache/media-libs/openal-1.15.1-r1 b/metadata/md5-cache/media-libs/openal-1.15.1-r1
index 3579ab0cceec..ed410e5a4454 100644
--- a/metadata/md5-cache/media-libs/openal-1.15.1-r1
+++ b/metadata/md5-cache/media-libs/openal-1.15.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[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(-)?] ) alstream? ( virtual/ffmpeg ) portaudio? ( >=media-libs/portaudio-19_pre20111121-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) abi_x86_32? ( !<app-emulation/emul-linux-x86-sdl-20131008-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.15.1.tar.bz2
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=15f77fdd6ae33fd7a29f369024649b6b
diff --git a/metadata/md5-cache/media-libs/openal-1.15.1-r2 b/metadata/md5-cache/media-libs/openal-1.15.1-r2
index 9f464cf0d921..e40f400f0808 100644
--- a/metadata/md5-cache/media-libs/openal-1.15.1-r2
+++ b/metadata/md5-cache/media-libs/openal-1.15.1-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[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(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) abi_x86_32? ( !<app-emulation/emul-linux-x86-sdl-20131008-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.15.1.tar.bz2
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f8807f5f7b727acd13913ea62850bae5
diff --git a/metadata/md5-cache/media-libs/openal-1.16.0 b/metadata/md5-cache/media-libs/openal-1.16.0
index 8a808dd04548..693013c6e6ae 100644
--- a/metadata/md5-cache/media-libs/openal-1.16.0
+++ b/metadata/md5-cache/media-libs/openal-1.16.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[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(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) abi_x86_32? ( !<app-emulation/emul-linux-x86-sdl-20131008-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.16.0.tar.bz2
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=548bec8af094b81f00b811293ef6654b
diff --git a/metadata/md5-cache/media-libs/opencore-amr-0.1.3-r1 b/metadata/md5-cache/media-libs/opencore-amr-0.1.3-r1
index 98922c60aa0c..314c9afcdbc0 100644
--- a/metadata/md5-cache/media-libs/opencore-amr-0.1.3-r1
+++ b/metadata/md5-cache/media-libs/opencore-amr-0.1.3-r1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~pp
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/opencore-amr/opencore-amr-0.1.3.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c85502e7de86d50a4f4be2dd8127ba71
diff --git a/metadata/md5-cache/media-libs/openexr-2.0.1-r1 b/metadata/md5-cache/media-libs/openexr-2.0.1-r1
index 17cc7f89347c..35bb9a6c1a79 100644
--- a/metadata/md5-cache/media-libs/openexr-2.0.1-r1
+++ b/metadata/md5-cache/media-libs/openexr-2.0.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=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(-)?] >=media-libs/ilmbase-2.0.1:=[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/2.0.1
 SRC_URI=http://download.savannah.gnu.org/releases/openexr/openexr-2.0.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8b3c2f22e1cf5dc3b81785e7713efa78
diff --git a/metadata/md5-cache/media-libs/openexr-2.1.0 b/metadata/md5-cache/media-libs/openexr-2.1.0
index 23797fd7d0ea..1b06f980fd13 100644
--- a/metadata/md5-cache/media-libs/openexr-2.1.0
+++ b/metadata/md5-cache/media-libs/openexr-2.1.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=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(-)?] >=media-libs/ilmbase-2.1.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(-)?]
 SLOT=0/21
 SRC_URI=http://download.savannah.gnu.org/releases/openexr/openexr-2.1.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=15c365d1655488b1706e4a1ba82c98e3
diff --git a/metadata/md5-cache/media-libs/openexr-2.2.0 b/metadata/md5-cache/media-libs/openexr-2.2.0
index 01642350757b..975ac0475c24 100644
--- a/metadata/md5-cache/media-libs/openexr-2.2.0
+++ b/metadata/md5-cache/media-libs/openexr-2.2.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=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(-)?] >=media-libs/ilmbase-2.2.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(-)?]
 SLOT=0/22
 SRC_URI=http://download.savannah.gnu.org/releases/openexr/openexr-2.2.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e974381063049069f676a1cf65efb976
diff --git a/metadata/md5-cache/media-libs/openh264-1.4.0 b/metadata/md5-cache/media-libs/openh264-1.4.0
index 0b7b33976d67..447760f5195e 100644
--- a/metadata/md5-cache/media-libs/openh264-1.4.0
+++ b/metadata/md5-cache/media-libs/openh264-1.4.0
@@ -10,5 +10,5 @@ RDEPEND=!<www-client/firefox-38
 RESTRICT=bindist
 SLOT=0
 SRC_URI=https://github.com/cisco/openh264/archive/v1.4.0.tar.gz -> openh264-1.4.0.tar.gz https://github.com/mozilla/gmp-api/archive/Firefox38.tar.gz -> gmp-api-Firefox38.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	mozextension	ba6829881080a663d68531424a3dfbc6	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	mozextension	ba6829881080a663d68531424a3dfbc6	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=faf33ee812eb4ba37eaf106d2d69af7d
diff --git a/metadata/md5-cache/media-libs/openjpeg-1.5.2 b/metadata/md5-cache/media-libs/openjpeg-1.5.2
index 89c852b0735d..294f92388534 100644
--- a/metadata/md5-cache/media-libs/openjpeg-1.5.2
+++ b/metadata/md5-cache/media-libs/openjpeg-1.5.2
@@ -10,5 +10,5 @@ RDEPEND=media-libs/lcms:2= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib
 RESTRICT=test
 SLOT=0/5
 SRC_URI=mirror://sourceforge/openjpeg.mirror/openjpeg-1.5.2.tar.gz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=544284bbfb7ffdfa1b2b780e14f5b5c9
diff --git a/metadata/md5-cache/media-libs/openjpeg-1.5.2-r1 b/metadata/md5-cache/media-libs/openjpeg-1.5.2-r1
index 6bcd87ab6874..ad7f32cfd0d2 100644
--- a/metadata/md5-cache/media-libs/openjpeg-1.5.2-r1
+++ b/metadata/md5-cache/media-libs/openjpeg-1.5.2-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/lcms:2= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib
 RESTRICT=test
 SLOT=0/5
 SRC_URI=mirror://sourceforge/openjpeg.mirror/openjpeg-1.5.2.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=756c245d17c0333e75d75f2b41184415
diff --git a/metadata/md5-cache/media-libs/openjpeg-2.1.0-r1 b/metadata/md5-cache/media-libs/openjpeg-2.1.0-r1
index 6f221ec5dad1..7a8876f7a976 100644
--- a/metadata/md5-cache/media-libs/openjpeg-2.1.0-r1
+++ b/metadata/md5-cache/media-libs/openjpeg-2.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=media-libs/lcms:2= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib
 RESTRICT=test
 SLOT=2/7
 SRC_URI=mirror://sourceforge/openjpeg.mirror/openjpeg-2.1.0.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=dbe4f7cdad2d6d399339cb4ee1feaa18
diff --git a/metadata/md5-cache/media-libs/opus-1.0.2-r2 b/metadata/md5-cache/media-libs/opus-1.0.2-r2
index 93d0160a3013..e0a5ee19216a 100644
--- a/metadata/md5-cache/media-libs/opus-1.0.2-r2
+++ b/metadata/md5-cache/media-libs/opus-1.0.2-r2
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/opus/opus-1.0.2.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ebd9f954aea285a0d81631fc0a31889b
diff --git a/metadata/md5-cache/media-libs/opus-1.1 b/metadata/md5-cache/media-libs/opus-1.1
index cd5d5e1452c5..16de3df67541 100644
--- a/metadata/md5-cache/media-libs/opus-1.1
+++ b/metadata/md5-cache/media-libs/opus-1.1
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/opus/opus-1.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8a4e1684ce5a385de856ff7b2ae77e4c
diff --git a/metadata/md5-cache/media-libs/oyranos-0.9.4-r2 b/metadata/md5-cache/media-libs/oyranos-0.9.4-r2
index f70898732f27..1dd21784e1fa 100644
--- a/metadata/md5-cache/media-libs/oyranos-0.9.4-r2
+++ b/metadata/md5-cache/media-libs/oyranos-0.9.4-r2
@@ -10,5 +10,5 @@ RDEPEND==app-admin/elektra-0.7*:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/oyranos/Oyranos/Oyranos%200.4/oyranos-0.9.4.tar.bz2
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=80de4e9518af6e8e9170f568a6fb61f7
diff --git a/metadata/md5-cache/media-libs/oyranos-0.9.5 b/metadata/md5-cache/media-libs/oyranos-0.9.5
index 9718af9e325b..fd81d81d9f75 100644
--- a/metadata/md5-cache/media-libs/oyranos-0.9.5
+++ b/metadata/md5-cache/media-libs/oyranos-0.9.5
@@ -10,5 +10,5 @@ RDEPEND=|| ( =app-admin/elektra-0.7*:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/oyranos/Oyranos/Oyranos%200.9/oyranos-0.9.5.tar.bz2
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=dc58a2d5f9fd665bde78da9556d7823e
diff --git a/metadata/md5-cache/media-libs/oyranos-9999 b/metadata/md5-cache/media-libs/oyranos-9999
index dcae8acc0e6f..839b6fe34195 100644
--- a/metadata/md5-cache/media-libs/oyranos-9999
+++ b/metadata/md5-cache/media-libs/oyranos-9999
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=|| ( =app-admin/elektra-0.7*: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(-)?] >=app-admin/elektra-0.8.4: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(-)?] ) >=dev-libs/libxml2-2.9.1-r4[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(-)?] >=dev-libs/yajl-2.0.4-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(-)?] media-libs/icc-profiles-basiccolor-printing2009 media-libs/icc-profiles-openicc >=media-libs/lcms-2.5:2[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(-)?] >=media-libs/libpng-1.6.10: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(-)?] >=media-libs/libXcm-0.5.3[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(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[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(-)?] ) cups? ( >=net-print/cups-1.7.1-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(-)?] ) exif? ( >=media-gfx/exiv2-0.23-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(-)?] ) fltk? ( x11-libs/fltk:1 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) raw? ( >=media-libs/libraw-0.15.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(-)?] ) X? ( >=x11-libs/libXfixes-5.0.1[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(-)?] >=x11-libs/libXrandr-1.4.2[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(-)?] >=x11-libs/libXxf86vm-1.1.3[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(-)?] >=x11-libs/libXinerama-1.1.3[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(-)?] )
 RESTRICT=test
 SLOT=0
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=23f3b0f82310b4cabab0b801b3c31dc4
diff --git a/metadata/md5-cache/media-libs/phonon-4.8.3-r1 b/metadata/md5-cache/media-libs/phonon-4.8.3-r1
index 80ec6bcd9964..0643503be9de 100644
--- a/metadata/md5-cache/media-libs/phonon-4.8.3-r1
+++ b/metadata/md5-cache/media-libs/phonon-4.8.3-r1
@@ -11,5 +11,5 @@ RDEPEND=!!dev-qt/qtphonon:4 qt4? ( dev-qt/qtcore:4[abi_x86_32(-)?,abi_x86_64(-)?
 REQUIRED_USE=|| ( qt4 qt5 ) zeitgeist? ( qt4 )
 SLOT=0
 SRC_URI=mirror://kde/stable/phonon/4.8.3/src/phonon-4.8.3.tar.xz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qmake-utils	8557b23f27697843c242ff27aaa99448	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qmake-utils	8557b23f27697843c242ff27aaa99448	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d01f0f4f93b6714680e9aa39e168f8f8
diff --git a/metadata/md5-cache/media-libs/phonon-9999 b/metadata/md5-cache/media-libs/phonon-9999
index ab34e3423154..b74cdc91bdac 100644
--- a/metadata/md5-cache/media-libs/phonon-9999
+++ b/metadata/md5-cache/media-libs/phonon-9999
@@ -9,5 +9,5 @@ PDEPEND=aqua? ( media-libs/phonon-qt7 ) gstreamer? ( >=media-libs/phonon-gstream
 RDEPEND=!!dev-qt/qtphonon:4 qt4? ( dev-qt/qtcore: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(-)?] dev-qt/qtdbus: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(-)?] dev-qt/qtgui: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(-)?] designer? ( dev-qt/designer: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(-)?] ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) ) pulseaudio? ( dev-libs/glib:2[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(-)?] >=media-sound/pulseaudio-0.9.21[glib,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(-)?] ) zeitgeist? ( dev-libs/libqzeitgeist )
 REQUIRED_USE=|| ( qt4 qt5 ) zeitgeist? ( qt4 )
 SLOT=0
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qmake-utils	8557b23f27697843c242ff27aaa99448	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	qmake-utils	8557b23f27697843c242ff27aaa99448	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=5ebbd7be3eeed4b5f2833f8ff1ed39b9
diff --git a/metadata/md5-cache/media-libs/portaudio-19_pre20140130 b/metadata/md5-cache/media-libs/portaudio-19_pre20140130
index 2bb7196c622b..5d3227b832f2 100644
--- a/metadata/md5-cache/media-libs/portaudio-19_pre20140130
+++ b/metadata/md5-cache/media-libs/portaudio-19_pre20140130
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[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(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r8 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.portaudio.com/archives/pa_stable_v19_20140130.tgz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1b43944a51c298e26ab20bd955e0c866
diff --git a/metadata/md5-cache/media-libs/sbc-1.2 b/metadata/md5-cache/media-libs/sbc-1.2
index 2f44ce86a8f5..5c4eea0490ff 100644
--- a/metadata/md5-cache/media-libs/sbc-1.2
+++ b/metadata/md5-cache/media-libs/sbc-1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/bluetooth/sbc-1.2.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0d325bbff4222e400075253031bef2fd
diff --git a/metadata/md5-cache/media-libs/sbc-1.3 b/metadata/md5-cache/media-libs/sbc-1.3
index 7a5dae545ab9..f8ec473dcc10 100644
--- a/metadata/md5-cache/media-libs/sbc-1.3
+++ b/metadata/md5-cache/media-libs/sbc-1.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/bluetooth/sbc-1.3.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d97209dc5f2c7c6c5cbe0a9da07b619b
diff --git a/metadata/md5-cache/media-libs/schroedinger-1.0.11-r1 b/metadata/md5-cache/media-libs/schroedinger-1.0.11-r1
index 7d98bb7685b3..9c1d7857c7dc 100644
--- a/metadata/md5-cache/media-libs/schroedinger-1.0.11-r1
+++ b/metadata/md5-cache/media-libs/schroedinger-1.0.11-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2 MIT MPL-1.1
 RDEPEND=>=dev-lang/orc-0.4.17[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
 SRC_URI=http://www.diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4ef14a8c8abee4fab990988296844a9e
diff --git a/metadata/md5-cache/media-libs/sdl-gfx-2.0.25 b/metadata/md5-cache/media-libs/sdl-gfx-2.0.25
index 7ae722b275a9..145c7ed9c377 100644
--- a/metadata/md5-cache/media-libs/sdl-gfx-2.0.25
+++ b/metadata/md5-cache/media-libs/sdl-gfx-2.0.25
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl-1.2.15-r4[video,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
 SRC_URI=http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.25.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=5c7e725d5ceb1aa58b03abe4bb3de366
diff --git a/metadata/md5-cache/media-libs/sdl-image-1.2.12-r1 b/metadata/md5-cache/media-libs/sdl-image-1.2.12-r1
index f623747d84ef..b50846f6540a 100644
--- a/metadata/md5-cache/media-libs/sdl-image-1.2.12-r1
+++ b/metadata/md5-cache/media-libs/sdl-image-1.2.12-r1
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-sdl-20140406 ) >=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(-)?] >=media-libs/libsdl-1.2.15-r4[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(-)?] png? ( >=media-libs/libpng-1.6.10: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(-)?] ) jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) tiff? ( >=media-libs/tiff-3.9.7-r1: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(-)?] ) webp? ( >=media-libs/libwebp-0.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(-)?] )
 SLOT=0
 SRC_URI=http://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a51a06d2bf1bb7aa7689fe6cb8faf6e3
diff --git a/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r4 b/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r4
index fda88dee7297..abbcda3f744b 100644
--- a/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r4
+++ b/metadata/md5-cache/media-libs/sdl-mixer-1.2.12-r4
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=midi? ( || ( timidity fluidsynth ) ) timidity? ( midi ) fluidsynth? ( midi ) mp3? ( || ( smpeg mad ) ) smpeg? ( mp3 ) mad? ( mp3 ) mod? ( || ( mikmod modplug ) ) mikmod? ( mod ) modplug? ( mod )
 SLOT=0
 SRC_URI=http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2ce424f1d8af461dcc19c309bbea3cb8
diff --git a/metadata/md5-cache/media-libs/sdl-net-1.2.8-r1 b/metadata/md5-cache/media-libs/sdl-net-1.2.8-r1
index 12bef55c75a7..79e9256c14ae 100644
--- a/metadata/md5-cache/media-libs/sdl-net-1.2.8-r1
+++ b/metadata/md5-cache/media-libs/sdl-net-1.2.8-r1
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-sdl-20140406 ) >=media-libs/libsdl-1.2.15-r4[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
 SRC_URI=http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=dcb537e9c4b202be120f4b185cdddffa
diff --git a/metadata/md5-cache/media-libs/sdl-sound-1.0.3-r1 b/metadata/md5-cache/media-libs/sdl-sound-1.0.3-r1
index a05953ce1ad9..69ea9bec465c 100644
--- a/metadata/md5-cache/media-libs/sdl-sound-1.0.3-r1
+++ b/metadata/md5-cache/media-libs/sdl-sound-1.0.3-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-sdl-20140406 ) >=media-libs/libsdl-1.2.15-r4[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(-)?] flac? ( >=media-libs/flac-1.2.1-r5[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(-)?] ) mikmod? ( >=media-libs/libmikmod-3.2.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(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-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(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.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(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] >=media-libs/libogg-1.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(-)?] ) physfs? ( >=dev-games/physfs-2.0.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(-)?] ) mpeg? ( >=media-libs/smpeg-0.4.4-r10[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
 SRC_URI=http://icculus.org/SDL_sound/downloads/SDL_sound-1.0.3.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=777eb71f86ebd641d886982f59ca1399
diff --git a/metadata/md5-cache/media-libs/sdl-ttf-2.0.11-r1 b/metadata/md5-cache/media-libs/sdl-ttf-2.0.11-r1
index 4f39ff96ef09..e85affaa72e7 100644
--- a/metadata/md5-cache/media-libs/sdl-ttf-2.0.11-r1
+++ b/metadata/md5-cache/media-libs/sdl-ttf-2.0.11-r1
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-sdl-20140406 ) X? ( >=x11-libs/libXt-1.1.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(-)?] ) >=media-libs/libsdl-1.2.15-r4[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(-)?] >=media-libs/freetype-2.5.0.1[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
 SRC_URI=http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7d3f03759f3cedf18d2ead677b787e80
diff --git a/metadata/md5-cache/media-libs/sdl2-gfx-1.0.1 b/metadata/md5-cache/media-libs/sdl2-gfx-1.0.1
index 61c5f8930ec0..a21e13c18242 100644
--- a/metadata/md5-cache/media-libs/sdl2-gfx-1.0.1
+++ b/metadata/md5-cache/media-libs/sdl2-gfx-1.0.1
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl2-2.0.1-r1[video,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
 SRC_URI=http://www.ferzkopp.net/Software/SDL2_gfx/SDL2_gfx-1.0.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7a2d0ab6a89010a1ed1337568a5e47be
diff --git a/metadata/md5-cache/media-libs/sdl2-image-2.0.0-r1 b/metadata/md5-cache/media-libs/sdl2-image-2.0.0-r1
index e42200bd8547..447b26f74ecb 100644
--- a/metadata/md5-cache/media-libs/sdl2-image-2.0.0-r1
+++ b/metadata/md5-cache/media-libs/sdl2-image-2.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl2-2.0.1-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(-)?] >=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(-)?] png? ( >=media-libs/libpng-1.6.10: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(-)?] ) jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) tiff? ( >=media-libs/tiff-3.9.7-r1: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(-)?] ) webp? ( >=media-libs/libwebp-0.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(-)?] )
 SLOT=0
 SRC_URI=http://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=83f4fbd60a98fe0bb779132663896ede
diff --git a/metadata/md5-cache/media-libs/sdl2-mixer-2.0.0-r1 b/metadata/md5-cache/media-libs/sdl2-mixer-2.0.0-r1
index 6d1e73aeee4f..a4e129069fe2 100644
--- a/metadata/md5-cache/media-libs/sdl2-mixer-2.0.0-r1
+++ b/metadata/md5-cache/media-libs/sdl2-mixer-2.0.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsdl2-2.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=midi? ( || ( timidity fluidsynth ) ) timidity? ( midi ) fluidsynth? ( midi ) mp3? ( || ( smpeg mad ) ) smpeg? ( mp3 ) mad? ( mp3 ) mod? ( || ( mikmod modplug ) ) mikmod? ( mod ) modplug? ( mod ) tremor? ( vorbis )
 SLOT=0
 SRC_URI=http://www.libsdl.org/projects/SDL_mixer/release/SDL2_mixer-2.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f221e70b24ebdccc08323f027e050ec6
diff --git a/metadata/md5-cache/media-libs/sdl2-net-2.0.0-r1 b/metadata/md5-cache/media-libs/sdl2-net-2.0.0-r1
index d436a26a4ad3..e41fcd2a612e 100644
--- a/metadata/md5-cache/media-libs/sdl2-net-2.0.0-r1
+++ b/metadata/md5-cache/media-libs/sdl2-net-2.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=>=media-libs/libsdl2-2.0.1-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
 SRC_URI=http://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.0.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=865592e00ee741b6ade5bb927ce952a4
diff --git a/metadata/md5-cache/media-libs/sdl2-ttf-2.0.12-r1 b/metadata/md5-cache/media-libs/sdl2-ttf-2.0.12-r1
index 7e2ae0b2cf58..0649f7ca83ca 100644
--- a/metadata/md5-cache/media-libs/sdl2-ttf-2.0.12-r1
+++ b/metadata/md5-cache/media-libs/sdl2-ttf-2.0.12-r1
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=X? ( >=x11-libs/libXt-1.1.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(-)?] ) >=media-libs/libsdl2-2.0.1-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(-)?] >=media-libs/freetype-2.5.0.1[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
 SRC_URI=http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-2.0.12.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=89f4fd79ce35140a833b0e20f1ca7bdc
diff --git a/metadata/md5-cache/media-libs/smpeg-0.4.4-r10 b/metadata/md5-cache/media-libs/smpeg-0.4.4-r10
index 2e72e1461fd2..690b973c9af5 100644
--- a/metadata/md5-cache/media-libs/smpeg-0.4.4-r10
+++ b/metadata/md5-cache/media-libs/smpeg-0.4.4-r10
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-sdl-20140406 ) >=media-libs/libsdl-1.2.15-r4[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(-)?] opengl? ( >=virtual/glu-9.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(-)?] >=virtual/opengl-7.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(-)?] ) X? ( >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXi-1.7.2[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(-)?] >=x11-libs/libX11-1.6.2[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
 SRC_URI=ftp://ftp.lokigames.com/pub/open-source/smpeg/smpeg-0.4.4.tar.gz mirror://gentoo/smpeg-0.4.4-gtkm4.patch.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=bc915e28ff72a60ed50a5f9bab38458c
diff --git a/metadata/md5-cache/media-libs/smpeg2-2.0.0-r3 b/metadata/md5-cache/media-libs/smpeg2-2.0.0-r3
index dc2dbcd6f5f8..7cab419e1439 100644
--- a/metadata/md5-cache/media-libs/smpeg2-2.0.0-r3
+++ b/metadata/md5-cache/media-libs/smpeg2-2.0.0-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=media-libs/libsdl2-2.0.1-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
 SRC_URI=http://dev.gentoo.org/~hasufell/distfiles/smpeg-2.0.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e473b32b3b30295c75559e8c896dccff
diff --git a/metadata/md5-cache/media-libs/soxr-0.1.0 b/metadata/md5-cache/media-libs/soxr-0.1.0
index de79374b068b..f41c2ee04515 100644
--- a/metadata/md5-cache/media-libs/soxr-0.1.0
+++ b/metadata/md5-cache/media-libs/soxr-0.1.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~mips
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/soxr/soxr-0.1.0-Source.tar.xz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ca059af14fe781c72f770ee5b7e9201f
diff --git a/metadata/md5-cache/media-libs/soxr-0.1.1 b/metadata/md5-cache/media-libs/soxr-0.1.1
index bd14bad1f312..5da41e7d0202 100644
--- a/metadata/md5-cache/media-libs/soxr-0.1.1
+++ b/metadata/md5-cache/media-libs/soxr-0.1.1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=mirror://sourceforge/soxr/soxr-0.1.1-Source.tar.xz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=5ee9fc4835a97406f0ab05c88d2106ab
diff --git a/metadata/md5-cache/media-libs/speex-1.2_rc1-r2 b/metadata/md5-cache/media-libs/speex-1.2_rc1-r2
index 25dae4acf9a7..7417cf08ec5f 100644
--- a/metadata/md5-cache/media-libs/speex-1.2_rc1-r2
+++ b/metadata/md5-cache/media-libs/speex-1.2_rc1-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ogg? ( media-libs/libogg:= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=14322446a73b7db108f7d9f9f0f952f8
diff --git a/metadata/md5-cache/media-libs/taglib-1.9.1-r2 b/metadata/md5-cache/media-libs/taglib-1.9.1-r2
index fdf5af77b612..19051bb2c3cc 100644
--- a/metadata/md5-cache/media-libs/taglib-1.9.1-r2
+++ b/metadata/md5-cache/media-libs/taglib-1.9.1-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 MPL-1.1
 RDEPEND=>=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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r2 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=https://github.com/taglib/taglib/archive/v1.9.1.tar.gz -> taglib-1.9.1.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b5ba198dc69849f1ca3fb50f03fc875f
diff --git a/metadata/md5-cache/media-libs/tiff-3.9.7-r1 b/metadata/md5-cache/media-libs/tiff-3.9.7-r1
index 71a4c7236806..9e86bee10d7a 100644
--- a/metadata/md5-cache/media-libs/tiff-3.9.7-r1
+++ b/metadata/md5-cache/media-libs/tiff-3.9.7-r1
@@ -9,5 +9,5 @@ LICENSE=libtiff
 RDEPEND=jpeg? ( >=virtual/jpeg-0-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(-)?] ) jbig? ( >=media-libs/jbigkit-2.1[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(-)?] ) !media-libs/tiff-compat !=media-libs/tiff-3*:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r10 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=3
 SRC_URI=ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.7.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=cd017ecfefa9ec8112c90b9d429aa6cc
diff --git a/metadata/md5-cache/media-libs/tiff-4.0.3-r6 b/metadata/md5-cache/media-libs/tiff-4.0.3-r6
index 3fb18a8b9871..83691543f1b0 100644
--- a/metadata/md5-cache/media-libs/tiff-4.0.3-r6
+++ b/metadata/md5-cache/media-libs/tiff-4.0.3-r6
@@ -10,5 +10,5 @@ RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 REQUIRED_USE=test? ( jpeg )
 SLOT=0
 SRC_URI=http://download.osgeo.org/libtiff/tiff-4.0.3.tar.gz ftp://ftp.remotesensing.org/pub/libtiff/tiff-4.0.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=56d8870794762ed5114fe9752215f9fd
diff --git a/metadata/md5-cache/media-libs/tremor-0_pre20130223-r1 b/metadata/md5-cache/media-libs/tremor-0_pre20130223-r1
index f94de448e856..e337665a7e32 100644
--- a/metadata/md5-cache/media-libs/tremor-0_pre20130223-r1
+++ b/metadata/md5-cache/media-libs/tremor-0_pre20130223-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=media-libs/libogg-1.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(-)?]
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~ssuominen/tremor-0_pre20130223.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c83b64e2acab9cd0c466ca8b55d11194
diff --git a/metadata/md5-cache/media-libs/vo-aacenc-0.1.3 b/metadata/md5-cache/media-libs/vo-aacenc-0.1.3
index 30c7f25d099f..d1213a8bec2d 100644
--- a/metadata/md5-cache/media-libs/vo-aacenc-0.1.3
+++ b/metadata/md5-cache/media-libs/vo-aacenc-0.1.3
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~am
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/opencore-amr/vo-aacenc-0.1.3.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=20222b5ee3225bb45e7b36c7fb0bd6ff
diff --git a/metadata/md5-cache/media-libs/vo-aacenc-9999 b/metadata/md5-cache/media-libs/vo-aacenc-9999
index e9e952737337..4d8d736a427b 100644
--- a/metadata/md5-cache/media-libs/vo-aacenc-9999
+++ b/metadata/md5-cache/media-libs/vo-aacenc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://sourceforge.net/projects/opencore-amr/
 IUSE=examples static-libs neon 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
 LICENSE=Apache-2.0
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=5a0a34bd1517c96960e5d28119304a59
diff --git a/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.2-r1 b/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.2-r1
index be346a5414f7..110cc81d1e78 100644
--- a/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.2-r1
+++ b/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.2-r1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/opencore-amr/vo-amrwbenc-0.1.2.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=23684be7a6717c9a276edc8a2a6cfe75
diff --git a/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.3 b/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.3
index 6281e2d48547..c3c913cc05c4 100644
--- a/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.3
+++ b/metadata/md5-cache/media-libs/vo-amrwbenc-0.1.3
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x6
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=mirror://sourceforge/opencore-amr/vo-amrwbenc-0.1.3.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=63b9be36700cf0e18af2348a88d0b654
diff --git a/metadata/md5-cache/media-libs/vo-amrwbenc-9999 b/metadata/md5-cache/media-libs/vo-amrwbenc-9999
index 8d0c1331937c..015672e3cfc9 100644
--- a/metadata/md5-cache/media-libs/vo-amrwbenc-9999
+++ b/metadata/md5-cache/media-libs/vo-amrwbenc-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://sourceforge.net/projects/opencore-amr/
 IUSE=examples 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
 LICENSE=Apache-2.0
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0da7bf0b453a3d4ee88e2ea33b181061
diff --git a/metadata/md5-cache/media-libs/waffle-1.5.1 b/metadata/md5-cache/media-libs/waffle-1.5.1
index 184d9e01c5a2..81b7bc62b04c 100644
--- a/metadata/md5-cache/media-libs/waffle-1.5.1
+++ b/metadata/md5-cache/media-libs/waffle-1.5.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=>=media-libs/mesa-9.1.6[egl?,gbm?,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(-)?] >=virtual/opengl-7.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(-)?] wayland? ( >=dev-libs/wayland-1.0.6[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(-)?] ) gbm? ( >=virtual/libudev-208:=[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(-)?] ) >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libxcb-1.9.1[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
 SRC_URI=http://people.freedesktop.org/~chadversary/waffle/files/release/waffle-1.5.1/waffle-1.5.1.tar.xz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8cd4c78116a5bfe25794f37b1467d588
diff --git a/metadata/md5-cache/media-libs/waffle-9999 b/metadata/md5-cache/media-libs/waffle-9999
index 955c69b42704..51d1b08a3f6d 100644
--- a/metadata/md5-cache/media-libs/waffle-9999
+++ b/metadata/md5-cache/media-libs/waffle-9999
@@ -7,5 +7,5 @@ IUSE=doc egl gbm test wayland abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi
 LICENSE=BSD-2
 RDEPEND=>=media-libs/mesa-9.1.6[egl?,gbm?,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(-)?] >=virtual/opengl-7.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(-)?] wayland? ( >=dev-libs/wayland-1.0.6[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(-)?] ) gbm? ( >=virtual/libudev-208:=[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(-)?] ) >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libxcb-1.9.1[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
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=13981b6cd566f95865f4058f2c944f91
diff --git a/metadata/md5-cache/media-libs/webrtc-audio-processing-0.1-r1 b/metadata/md5-cache/media-libs/webrtc-audio-processing-0.1-r1
index 9c1eaa512178..528fea84d93e 100644
--- a/metadata/md5-cache/media-libs/webrtc-audio-processing-0.1-r1
+++ b/metadata/md5-cache/media-libs/webrtc-audio-processing-0.1-r1
@@ -8,5 +8,5 @@ LICENSE=BSD
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/webrtc-audio-processing-0.1.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ef80ad07fae0f50e455083ef57b139bf
diff --git a/metadata/md5-cache/media-libs/x264-0.0.20130731 b/metadata/md5-cache/media-libs/x264-0.0.20130731
index 6027e15b70be..41d6712d384e 100644
--- a/metadata/md5-cache/media-libs/x264-0.0.20130731
+++ b/metadata/md5-cache/media-libs/x264-0.0.20130731
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0/135
 SRC_URI=http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20130731-2245.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d17fbee45ffe23cafe73c8e99a40230e
diff --git a/metadata/md5-cache/media-libs/x264-0.0.20130912 b/metadata/md5-cache/media-libs/x264-0.0.20130912
index 03aaceb4b1e1..2479f0e9d8c3 100644
--- a/metadata/md5-cache/media-libs/x264-0.0.20130912
+++ b/metadata/md5-cache/media-libs/x264-0.0.20130912
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0/138
 SRC_URI=http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20130912-2245.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d83cbcd9df7ed3205cc570fdc71e7137
diff --git a/metadata/md5-cache/media-libs/x264-0.0.20140308 b/metadata/md5-cache/media-libs/x264-0.0.20140308
index 2778c1fa77fd..c1af61ff4cb1 100644
--- a/metadata/md5-cache/media-libs/x264-0.0.20140308
+++ b/metadata/md5-cache/media-libs/x264-0.0.20140308
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=opencl? ( >=virtual/opencl-0-r3[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-medialibs-20130224-r7 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0/142
 SRC_URI=http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20140308-2245.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ace68a8cf53aaa5c9cafffe8260e346c
diff --git a/metadata/md5-cache/media-libs/x264-9999 b/metadata/md5-cache/media-libs/x264-9999
index a9db4767b9ae..a812dd9aefcd 100644
--- a/metadata/md5-cache/media-libs/x264-9999
+++ b/metadata/md5-cache/media-libs/x264-9999
@@ -7,5 +7,5 @@ IUSE=10bit +interlaced opencl pic static-libs cpu_flags_x86_sse +threads abi_x86
 LICENSE=GPL-2
 RDEPEND=opencl? ( >=virtual/opencl-0-r3[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-medialibs-20130224-r7 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0/142
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6a37171ea891a3e7b314d6a9c28b6d0d
diff --git a/metadata/md5-cache/media-libs/x265-1.5 b/metadata/md5-cache/media-libs/x265-1.5
index bf6dd3ec2faa..acd6ee44024b 100644
--- a/metadata/md5-cache/media-libs/x265-1.5
+++ b/metadata/md5-cache/media-libs/x265-1.5
@@ -8,5 +8,5 @@ KEYWORDS=amd64 arm hppa ~ppc64 x86
 LICENSE=GPL-2
 SLOT=0/43
 SRC_URI=https://bitbucket.org/multicoreware/x265/get/1.5.tar.bz2 -> x265-1.5.tar.bz2
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=490855b696e72d87ca0c3df65068ad0a
diff --git a/metadata/md5-cache/media-libs/x265-1.7 b/metadata/md5-cache/media-libs/x265-1.7
index bd09110d19ee..cc97a0937014 100644
--- a/metadata/md5-cache/media-libs/x265-1.7
+++ b/metadata/md5-cache/media-libs/x265-1.7
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~arm ~hppa ~ppc64 ~x86
 LICENSE=GPL-2
 SLOT=0/59
 SRC_URI=https://bitbucket.org/multicoreware/x265/downloads/x265_1.7.tar.gz http://ftp.videolan.org/pub/videolan/x265/x265_1.7.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=90b1e6979ac6210aad48dadd056763e6
diff --git a/metadata/md5-cache/media-libs/x265-9999 b/metadata/md5-cache/media-libs/x265-9999
index 95d5ea3f758a..ec4380edae6f 100644
--- a/metadata/md5-cache/media-libs/x265-9999
+++ b/metadata/md5-cache/media-libs/x265-9999
@@ -6,5 +6,5 @@ HOMEPAGE=http://x265.org/
 IUSE=+10bit test 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
 LICENSE=GPL-2
 SLOT=0/59
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	mercurial	2fbda5894dda6392b71334ee9a92de0b	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	mercurial	2fbda5894dda6392b71334ee9a92de0b	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0abc3e8601d3dc5b210d1de25515b7d1
diff --git a/metadata/md5-cache/media-libs/xvid-1.3.3 b/metadata/md5-cache/media-libs/xvid-1.3.3
index 61db5e6ae020..b0581c63ffbc 100644
--- a/metadata/md5-cache/media-libs/xvid-1.3.3
+++ b/metadata/md5-cache/media-libs/xvid-1.3.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://downloads.xvid.org/downloads/xvidcore-1.3.3.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=9104204a65deb0c5af3b4df49e8f5aaa
diff --git a/metadata/md5-cache/media-libs/zvbi-0.2.35-r1 b/metadata/md5-cache/media-libs/zvbi-0.2.35-r1
index 04503d41f9fc..e079b159466c 100644
--- a/metadata/md5-cache/media-libs/zvbi-0.2.35-r1
+++ b/metadata/md5-cache/media-libs/zvbi-0.2.35-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=media-libs/libpng-1.5.18[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(-)?] >=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(-)?] nls? ( >=virtual/libintl-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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[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
 SRC_URI=mirror://sourceforge/zapping/zvbi-0.2.35.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1a7600db3e9df2db03cdd117ec492fd1
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.27-r3 b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.27-r3
index d2839559b122..10615d2bc834 100644
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.27-r3
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.27-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=media-libs/alsa-lib-1.0.27:=[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(-)?] ffmpeg? ( virtual/ffmpeg ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) abi_x86_32? ( !<app-emulation/emul-linux-x86-soundlibs-20140406-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32] )
 SLOT=0
 SRC_URI=mirror://alsaproject/plugins/alsa-plugins-1.0.27.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=3ae7eb4bd744261c47f3078d674875b3
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.28 b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.28
index 071201fe6b0f..daf36bf69d18 100644
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.28
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.28
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=media-libs/alsa-lib-1.0.28:=[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(-)?] ffmpeg? ( virtual/ffmpeg[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(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) abi_x86_32? ( !<app-emulation/emul-linux-x86-soundlibs-20140406-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32] )
 SLOT=0
 SRC_URI=mirror://alsaproject/plugins/alsa-plugins-1.0.28.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=26ed330ddc44a369975be43eb17e0120
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.29 b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.29
index 55b0b44cb916..8b7af8bb782d 100644
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.29
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.29
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=media-libs/alsa-lib-1.0.29:=[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(-)?] ffmpeg? ( virtual/ffmpeg[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(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) abi_x86_32? ( !<app-emulation/emul-linux-x86-soundlibs-20140406-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32] )
 SLOT=0
 SRC_URI=mirror://alsaproject/plugins/alsa-plugins-1.0.29.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e61caff76f51941065465e8faf44407d
diff --git a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.29-r1 b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.29-r1
index 421d23461e38..f0dd06f1639a 100644
--- a/metadata/md5-cache/media-plugins/alsa-plugins-1.0.29-r1
+++ b/metadata/md5-cache/media-plugins/alsa-plugins-1.0.29-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=>=media-libs/alsa-lib-1.0.29:=[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(-)?] ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) libsamplerate? ( >=media-libs/libsamplerate-0.1.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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) abi_x86_32? ( !<app-emulation/emul-linux-x86-soundlibs-20140406-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32] )
 SLOT=0
 SRC_URI=mirror://alsaproject/plugins/alsa-plugins-1.0.29.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=098a031d0b5f75e607edcc00cd50beca
diff --git a/metadata/md5-cache/media-plugins/alsaequal-0.6-r2 b/metadata/md5-cache/media-plugins/alsaequal-0.6-r2
index 6731822536e0..275c807aca1f 100644
--- a/metadata/md5-cache/media-plugins/alsaequal-0.6-r2
+++ b/metadata/md5-cache/media-plugins/alsaequal-0.6-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=media-libs/alsa-lib-1.0.27.2[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(-)?] >=media-plugins/caps-plugins-0.9.15[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-soundlibs-20130224-r3 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.thedigitalmachine.net/tools/alsaequal-0.6.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=9192a4f3de050aee89b9154c6b351a3b
diff --git a/metadata/md5-cache/media-plugins/caps-plugins-0.4.5-r2 b/metadata/md5-cache/media-plugins/caps-plugins-0.4.5-r2
index d42396348852..ef094663463f 100644
--- a/metadata/md5-cache/media-plugins/caps-plugins-0.4.5-r2
+++ b/metadata/md5-cache/media-plugins/caps-plugins-0.4.5-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://quitte.de/dsp/caps_0.4.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f062458ad94db08d58d3dd9c01014bd7
diff --git a/metadata/md5-cache/media-plugins/caps-plugins-0.9.10 b/metadata/md5-cache/media-plugins/caps-plugins-0.9.10
index 9524413f2927..ef0a5aa5edec 100644
--- a/metadata/md5-cache/media-plugins/caps-plugins-0.9.10
+++ b/metadata/md5-cache/media-plugins/caps-plugins-0.9.10
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://quitte.de/dsp/caps_0.9.10.tar.bz2 doc? ( http://quitte.de/dsp/caps-doc_0.9.10.tar.bz2 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=00f16ba42facf73acb5a83371ef7a197
diff --git a/metadata/md5-cache/media-plugins/caps-plugins-0.9.15 b/metadata/md5-cache/media-plugins/caps-plugins-0.9.15
index 48f729ca5748..07add39ffe8b 100644
--- a/metadata/md5-cache/media-plugins/caps-plugins-0.9.15
+++ b/metadata/md5-cache/media-plugins/caps-plugins-0.9.15
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://quitte.de/dsp/caps_0.9.15.tar.bz2 doc? ( http://quitte.de/dsp/caps-doc_0.9.15.tar.bz2 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=efcedd2737f1fd34dca42226afd338f5
diff --git a/metadata/md5-cache/media-plugins/gimp-gmic-1.6.5.0 b/metadata/md5-cache/media-plugins/gimp-gmic-1.6.5.0
new file mode 100644
index 000000000000..ad541ab31627
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gimp-gmic-1.6.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare pretend
+DEPEND=>=media-gfx/gimp-2.4.0 media-libs/libpng:0= sci-libs/fftw:3.0[threads] sys-libs/zlib
+DESCRIPTION=G'MIC GIMP plugin
+EAPI=5
+HOMEPAGE=http://gmic.eu/
+IUSE=openmp
+KEYWORDS=~amd64 ~x86
+LICENSE=CeCILL-2
+RDEPEND=>=media-gfx/gimp-2.4.0 media-libs/libpng:0= sci-libs/fftw:3.0[threads] sys-libs/zlib
+SLOT=0
+SRC_URI=http://gmic.eu/files/source/gmic_1.6.5.0.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=6c3aca9fa7725fbac5d7575e344f3f4a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-0.10.19-r1 b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-0.10.19-r1
index eaf77bc9e157..d5ab347b22af 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-0.10.19-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-0.10.19-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/a52dec-0.7.4-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bab3aa3a48b4f0e3b6c4e535c1cf6ad2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.2.4-r1
index 9dd1b60081e5..5167c096691a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/a52dec-0.7.4-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c2a86c434833456c085bd4f03ce6412a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.4.5
index 75aea3e387a7..d32e7cb43380 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-a52dec-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/a52dec-0.7.4-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0dc31ee72b9bff3f8082e9e25818690d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-alsa-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-alsa-0.10.36-r1
index eb07307a8648..3b9095a44f13 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-alsa-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-alsa-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a28d65ad4cbc361c13df5e57bbd34d01
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-amr-0.10.19-r1 b/metadata/md5-cache/media-plugins/gst-plugins-amr-0.10.19-r1
index ba9ba99aa2de..b346fcfb5215 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-amr-0.10.19-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-amr-0.10.19-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2ce937b8d7db2a9547b2f72551d9442e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-amr-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-amr-1.2.4-r1
index 6c5e752d2e4d..e96cb3ec37b0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-amr-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-amr-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7804793be51ae6f492392c175b9739da
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-amr-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-amr-1.4.5
index 2a0178a7b059..6feae70792d0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-amr-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-amr-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2c8db15a7b4f0a1d002582da6de93ae7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-annodex-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-annodex-0.10.31-r1
index ab17e321cb05..59979157a2c3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-annodex-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-annodex-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4a28fad3cbf516aee2301fe0b888c8eb
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-assrender-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-assrender-0.10.23-r1
index ededf942039e..44aca2af68f7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-assrender-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-assrender-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libass-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=05d11f9c79ef36bf102a1ba8605cd77b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.2.4-r1
index 12f0b33f2392..2ad3214dc978 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libass-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a7d215d986d4aa26549786b1320b7c60
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.4.5
index 74705ca62915..e88583e3f150 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-assrender-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libass-0.10.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9d8cb23a63c908249361bd3f9a0a216f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdio-0.10.19-r1 b/metadata/md5-cache/media-plugins/gst-plugins-cdio-0.10.19-r1
index 3cf10e71cf7f..845d0daa4a76 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdio-0.10.19-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdio-0.10.19-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libcdio-0.90-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a96dea55dff6cbf33d45ea7df032ae8a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.2.4-r1
index 8bac43c6bfda..b15c1e6a626d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libcdio-0.90-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1cbde498df516f2ad448b8960deb1526
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.4.5
index c2d1b3724d99..cd891d04ee7b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdio-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libcdio-0.90-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3c34958d5de972d195791bc82fc448f2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-0.10.36-r1
index 4f069669a1a1..b6c922be4e82 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8d2447995a3e26bed138a03ed7aaaf8a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.2.4-r1
index 3651db58b341..ee3585281f78 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0cd9a08b35b394410da9155add45806e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.4.5
index 8001eb5b1052..73487bda5779 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-cdparanoia-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/cdparanoia-3.10.2-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=82b2dd3040ebea709adbd326d432a047
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.2.4-r1
index 6063beef77fe..056d2198df2b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ba000f5dd70e1e78702e62db3fd4f27b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.4.5
index 5593a2cdd023..37d1366f258e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dash-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dash-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fb7a5f22504ea170cced53d853313b5f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dts-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-dts-0.10.23-r1
index f5584f065b4f..858fa88fee5e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dts-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dts-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9565dbd0bcc2fc8619edd44eb211b92b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.2.4-r1
index 3320599b2aa4..ca24303775cd 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=307943b8c38d43a493f678cedd035107
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.4.5
index ed403b71d77d..a592b0bf16c6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dts-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dts-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdca-0.0.5-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e392b46862c0eeaefe6e0d7f4d6c87d7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dv-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-dv-0.10.31-r1
index 24d622b1d71b..2bc0fe513592 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dv-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dv-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dd3733a8d9bf0ad3171b80b74ae38be7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.2.4-r1
index 1702741ddeb4..314c5bd0c4ae 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=503b678c428347ca8aa5ae4d1f84ebec
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.4.5
index 645b9a7de11f..75c30070944d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dv-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dv-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=805381e7d6703e487e8c88690a13092c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvb-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-dvb-0.10.23-r1
index 303d4fa8ef31..4dfa8c200d1d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvb-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvb-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=920d4f751234adccbe804e589836c5ba
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.2.4-r1
index e53c755dc23c..bbb1d8fd4b15 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=940a28fe046e5c9b5349ab8364b6a589
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.4.5
index eafaca937a1b..5a0aa45ed5aa 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvb-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7e068319aa4088efe846262754996dda
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-0.10.19-r1 b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-0.10.19-r1
index 642b50114a56..23bde6f0e0ac 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-0.10.19-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-0.10.19-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6a044512850a83b0b5f567c68dd35590
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.2.4-r1
index 74529923a1ae..8c72c5976c50 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b4929634db993e72dc719811931b64d4
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.4.5
index 81bc3ba483f7..17a308ae06c5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-dvdread-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdvdread-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7a2d2d806a9f8a0d5cb291205cd459ac
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faac-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-faac-0.10.23-r1
index 51e53bcb2b39..afd5815974f6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faac-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faac-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4935c7f0c0d0aeb683b52399d2117855
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.2.4-r1
index df65a3ffaa01..639f7d96f517 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=75c2fe60b45704bebd0e5f75500fcfa8
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.4.5
index f1e7fb4457ba..48ab046e03c5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faac-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faac-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/faac-1.28-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=25a5d804d1ef42f543d059cee38ce53c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faad-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-faad-0.10.23-r1
index 68187849e4cc..411ca41e8b3c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faad-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faad-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/faad2-2.7-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e381675fdee49ee33e2fb120213c5414
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faad-0.10.23-r2 b/metadata/md5-cache/media-plugins/gst-plugins-faad-0.10.23-r2
index 48f920ed6d74..d70235390381 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faad-0.10.23-r2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faad-0.10.23-r2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/faad2-2.7-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b199ae37c511eb8a8240532ca177f4c3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.2.4-r1
index c16326c4918b..409ffc879b15 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/faad2-2.7-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ba6b081cd20ab855330dd9e8d2503f26
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.4.5
index 6bcf0e3c9717..19974995524a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/faad2-2.7-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c9ca6058137eb6ca8fdf33f77bfdc564
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.4.5-r1 b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.4.5-r1
index 87454e4b3030..058f94184edf 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-faad-1.4.5-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-faad-1.4.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/faad2-2.7-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3d97bbbf7ea43409fa59eaf622dc00e9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r2 b/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r2
index c75916c05dd6..528e8b765354 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/gstreamer-0.10.36-r2:0.10[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(-)?] >=media-libs/gst-plugins-base-0.10.36:0.10[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(-)?] >=virtual/ffmpeg-9-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(-)?] || ( >=media-video/ffmpeg-1.2.6-r1: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(-)?] >=media-libs/libpostproc-10.20140517-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(-)?] ) orc? ( >=dev-lang/orc-0.4.17[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-gstplugins[-abi_x86_32(-)] )
 SLOT=0.10
 SRC_URI=http://dev.gentoo.org/~tetromino/distfiles/gst-plugins-ffmpeg/gst-ffmpeg-0.10.13_p201211.tar.xz http://dev.gentoo.org/~tetromino/distfiles/gst-plugins-ffmpeg/gst-ffmpeg-0.10.13_p201211-libav-9-patches.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=377058140be0d73ee32f66fb3c42be6d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r3 b/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r3
index 95b5d1149e29..159ad08464cd 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/gstreamer-0.10.36-r2:0.10[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(-)?] >=media-libs/gst-plugins-base-0.10.36:0.10[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(-)?] !libav? ( >=media-video/ffmpeg-1.2.6-r1: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(-)?] ) libav? ( >=media-video/libav-9.12: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(-)?] <media-video/libav-10: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(-)?] >=media-libs/libpostproc-10.20140517-r1: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(-)?] ) orc? ( >=dev-lang/orc-0.4.17[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-gstplugins[-abi_x86_32(-)] )
 SLOT=0.10
 SRC_URI=http://dev.gentoo.org/~tetromino/distfiles/gst-plugins-ffmpeg/gst-ffmpeg-0.10.13_p201211.tar.xz http://dev.gentoo.org/~tetromino/distfiles/gst-plugins-ffmpeg/gst-ffmpeg-0.10.13_p201211-libav-9-patches.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f59d0319886fd70d6340c66eb91db4d0
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r4 b/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r4
index 8766f51824ef..d9dd3d2003c2 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ffmpeg-0.10.13_p201211-r4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/gstreamer-0.10.36-r2:0.10[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(-)?] >=media-libs/gst-plugins-base-0.10.36:0.10[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(-)?] !libav? ( >=media-video/ffmpeg-1.2.6-r1: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(-)?] ) libav? ( >=media-video/libav-11.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(-)?] >=media-libs/libpostproc-10.20140517-r1: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(-)?] ) orc? ( >=dev-lang/orc-0.4.17[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-gstplugins[-abi_x86_32(-)] )
 SLOT=0.10
 SRC_URI=http://dev.gentoo.org/~tetromino/distfiles/gst-plugins-ffmpeg/gst-ffmpeg-0.10.13_p201211.tar.xz http://dev.gentoo.org/~tetromino/distfiles/gst-plugins-ffmpeg/gst-ffmpeg-0.10.13_p201211-libav-9-patches.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=60da35da5d68efea63b677d6abb6310e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-flac-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-flac-0.10.31-r1
index 398f144cae45..a700b58ad7b0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-flac-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-flac-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9944f39f0dee5aaa1f8fa9cf0a0c3119
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.2.4-r1
index 3f3690e1c534..bceb0a39e00f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=77159dea79cbc0bb3a915af584c34a35
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.4.5
index f1f1da76c523..731d902cd44e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-flac-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-flac-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/flac-1.2.1-r5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2a13cbdf0bb7019d4d0cb6ae6e5d05ab
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gconf-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-gconf-0.10.31-r1
index ede0062df307..bb5fb53338c7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gconf-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gconf-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/gconf-2.32.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a633be1f97ab27b810880297e29e7b2e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-0.10.31-r1
index 48c601717e18..ff7a409e2b1a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/gdk-pixbuf-2.30.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4e68205c95f6b8643dbb48b85c19143e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.2.4-r1
index 8989e442c715..ac7920ed8c8d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/gdk-pixbuf-2.30.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b31eb66783f6d29516f9360be71b02e5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.4.5
index f5dd84826b90..66eabd830330 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gdkpixbuf-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/gdk-pixbuf-2.30.7:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bdf82ef7a86a2a1c06d08d358dd04df5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gio-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-gio-0.10.36-r1
index 563eab07dc93..c3f327ab8e1e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gio-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gio-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=94be2955fb8400e0a2798ec06b766255
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gl-0.10.3-r1 b/metadata/md5-cache/media-plugins/gst-plugins-gl-0.10.3-r1
index ba40fdc98673..91d7fccb559c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gl-0.10.3-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gl-0.10.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/glew-1.10.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-gl/gst-plugins-gl-0.10.3.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=015f54d888e4e608e8e0490c4f2f191d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gnomevfs-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-gnomevfs-0.10.36-r1
index 21b07dab7974..a4cd05bb41db 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gnomevfs-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gnomevfs-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=gnome-base/gnome-vfs-2.24.4-r2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=db711099894d4c704b9db10edb58b9bf
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-gsm-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-gsm-0.10.23-r1
index 6354c1802029..ed88c26f4271 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-gsm-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-gsm-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dbec31f77b1d423c49148a5edc54eecf
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.2.4-r1
index cdeec88413bf..4c8e9a5dae49 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/gnutls-2.12.23-r6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7899680ebc40d274d65478178b7641b5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.4.5
index 1f076a6fc3bc..0bab14d64fc8 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-hls-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-hls-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/nettle[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1e691cbf92aeca0bff954edbc17ce925
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ivorbis-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-ivorbis-0.10.36-r1
index e3023f335b10..d11f61075d7d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ivorbis-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ivorbis-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ecf672fab0f542d543e7f2d84f18a276
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-jack-0.10.31-r1
index 393f78e24fd0..fa1e0b9977d1 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jack-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jack-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)?,abi_x8
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e28bd3535685667909c1cca563a8a016
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.2.4-r1
index dd00e1e05005..67d1882cd7cd 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)?,abi_x8
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0f97dbb9f8199b16e8cca721f52f0934
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.4.5
index 9fa14ec59051..2d650f8f73f7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jack-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jack-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/jack-audio-connection-kit-0.121.3-r1[abi_x86_32(-)?,abi_x8
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=18edc0f43c65a59e45bfcaa75e70ad78
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-0.10.31-r1
index 076badcb4152..0d215887b13d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jpeg-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3b5c3ea80eead8aab9db84234306fed6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.2.4-r1
index 8bb6510b124d..020fe84761df 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jpeg-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cf2a5eea4a2cd43fca8215c6323d4b68
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.4.5
index fdf175e9842c..0fb851bd5211 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-jpeg-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=virtual/jpeg-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e5844c47f195fd11b7d55806e829662b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ladspa-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-0.10.23-r1
index 8e876f1a2bc8..1c1b57a9903f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ladspa-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ladspa-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0bbf351c0ae64f49c574b59d69baef9d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lame-0.10.19-r1 b/metadata/md5-cache/media-plugins/gst-plugins-lame-0.10.19-r1
index 7376d9dcfbce..c45bfdac15d9 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lame-0.10.19-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lame-0.10.19-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=19d398be330407773ea45b0c53a9f818
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.2.4-r1
index dfe78f9f9ec4..15d3c819f773 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d50d749d711264723caa7dc1a2fd08cd
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.4.5
index 221d8108b308..b49e5a947a95 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-lame-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-lame-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6595f94a3c1441bcff5ee9a99f395d8f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.2.4 b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.2.4
index 7c74b5112b58..26037f702594 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.2.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/gstreamer-1.2.3:1.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(-)?] >=media-libs/gst-plugins-base-1.2.3:1.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(-)?] >=virtual/ffmpeg-9-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(-)?] !!>=media-video/libav-10 orc? ( >=dev-lang/orc-0.4.17[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=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2d8e25ae195e466bce693205eeb32ccc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.2.4-r1
index 301cc62a616c..5568b424e942 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.2.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/gstreamer-1.2.3:1.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(-)?] >=media-libs/gst-plugins-base-1.2.3:1.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(-)?] libav? ( <media-video/libav-10: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(-)?] >=media-video/libav-9.12: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(-)?] ) !libav? ( >=media-video/ffmpeg-1.2.6-r1: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(-)?] ) orc? ( >=dev-lang/orc-0.4.17[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=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4b50449ab7a2d9315a05ae220112c968
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.4.5
index 0f0815dad625..f3165445889f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.4.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/gstreamer-1.4.0:1.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(-)?] >=media-libs/gst-plugins-base-1.4.0:1.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(-)?] || ( >=media-video/ffmpeg-2.2: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(-)?] >=media-video/libav-9[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(-)?] ) orc? ( >=dev-lang/orc-0.4.17[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=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1811d2fd4e8c8033fdd0fc80b27041b2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.4.5-r1 b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.4.5-r1
index a550affe7084..ecb37471bf26 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libav-1.4.5-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libav-1.4.5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/gstreamer-1.4.0:1.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(-)?] >=media-libs/gst-plugins-base-1.4.0:1.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(-)?] !libav? ( >=media-video/ffmpeg-2.2: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(-)?] ) libav? ( >=media-video/libav-9: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(-)?] ) orc? ( >=dev-lang/orc-0.4.17[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=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2a715a36dced4d9f617a4e73303ff081
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libmms-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-libmms-0.10.23-r1
index 57a140fdf8ff..b2c59f47d307 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libmms-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libmms-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d3748c2ffc2b666ee3711348d2538bea
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.2.4-r1
index 259e3c83222d..6c5bceeaa6a3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=78999bba1d2589fa9eb4d5b42a2dbeac
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.4.5
index 1208591def29..b56d0e5920f9 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libmms-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmms-0.6.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8b9f819ab5cb09c9e03ff1872825f5d7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.10 b/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.10
index d695293fe48c..b7f3190777d0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.10
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.10
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 LGPL-2.1 )
 RDEPEND=~net-libs/libnice-0.1.10[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(-)?] media-libs/gstreamer:0.10[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(-)?] media-libs/gst-plugins-base:0.10[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.10
 SRC_URI=http://nice.freedesktop.org/releases/libnice-0.1.10.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=29fb61f45e052d7393ef0e6c6ce0ebc5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.10-r100 b/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.10-r100
index fed6ed823890..7af530b55859 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.10-r100
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.10-r100
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 LGPL-2.1 )
 RDEPEND=~net-libs/libnice-0.1.10[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(-)?] media-libs/gstreamer:1.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(-)?] media-libs/gst-plugins-base:1.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(-)?]
 SLOT=1.0
 SRC_URI=http://nice.freedesktop.org/releases/libnice-0.1.10.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=9cc56fbe307cb71a8954b1d28fb2a913
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.13 b/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.13
index 9248d12704d9..aae815085092 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.13
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.13
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 LGPL-2.1 )
 RDEPEND=~net-libs/libnice-0.1.13[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(-)?] media-libs/gstreamer:0.10[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(-)?] media-libs/gst-plugins-base:0.10[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.10
 SRC_URI=http://nice.freedesktop.org/releases/libnice-0.1.13.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=50edd2d37aa3e56442c2afb5a2e0fe91
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.13-r100 b/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.13-r100
index 8dd16461be0d..e9e6715d35cd 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.13-r100
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.13-r100
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 LGPL-2.1 )
 RDEPEND=~net-libs/libnice-0.1.13[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(-)?] media-libs/gstreamer:1.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(-)?] media-libs/gst-plugins-base:1.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(-)?]
 SLOT=1.0
 SRC_URI=http://nice.freedesktop.org/releases/libnice-0.1.13.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4ace22a29aa3107d09527b159f34fdc5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.8 b/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.8
index fcf240a52bf8..783bb772d98a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.8
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.8
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 LGPL-2.1 )
 RDEPEND=~net-libs/libnice-0.1.8[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(-)?] media-libs/gstreamer:0.10[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(-)?] media-libs/gst-plugins-base:0.10[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.10
 SRC_URI=http://nice.freedesktop.org/releases/libnice-0.1.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2cd171f1d38539dcd6a20d93f74b9340
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.8-r100 b/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.8-r100
index 95a35884796d..6e7fa04412fd 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.8-r100
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libnice-0.1.8-r100
@@ -9,5 +9,5 @@ LICENSE=|| ( MPL-1.1 LGPL-2.1 )
 RDEPEND=~net-libs/libnice-0.1.8[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(-)?] media-libs/gstreamer:1.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(-)?] media-libs/gst-plugins-base:1.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(-)?]
 SLOT=1.0
 SRC_URI=http://nice.freedesktop.org/releases/libnice-0.1.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=379537a240fc298b6c02cfde0f2af94b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libpng-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-libpng-0.10.31-r1
index 1c4287c74e29..02fa21891c2e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libpng-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libpng-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=50d659311ab9ff0042fff732e7dc06c4
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.2.4-r1
index bc5346d9aacb..dc96b6af1f22 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=681e0ddf253f811998fc98f24f173a1c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.4.5
index 600cb4e916ba..102f2c14117b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libpng-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9b57d04d238b51c81d2f6b57602dc67e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-0.10.36-r1
index 668ade206bc7..131c4a86692d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libvisual-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b5d8bc32c40f524187309458dc22bff9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.2.4-r1
index 333137a483c7..50b54b91e58c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libvisual-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=73cdb4b4e46efef2db437a230a6a0687
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.4.5
index 6840d05c1e55..6c5432041aee 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-libvisual-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libvisual-0.4.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d0b5cf557d5dea7574bede3e723235f5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mad-0.10.19-r1 b/metadata/md5-cache/media-plugins/gst-plugins-mad-0.10.19-r1
index e5ecced5746a..7b63e85565a4 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mad-0.10.19-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mad-0.10.19-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8ebc33995ced4eb8dd754e14ca19fd2e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mad-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-mad-1.2.4-r1
index e8601b386e58..6f22a664f97a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mad-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mad-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e039b49ec25ed5de9624e6a14d924090
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mad-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-mad-1.4.5
index 4c62aa6577ef..f8fb6d752393 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mad-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mad-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmad-0.15.1b-r8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4503d2a6c174c486a888c4ded06982bd
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-meta-0.10-r10 b/metadata/md5-cache/media-plugins/gst-plugins-meta-0.10-r10
index 7c48202d8f03..bda7a946eae0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-meta-0.10-r10
+++ b/metadata/md5-cache/media-plugins/gst-plugins-meta-0.10-r10
@@ -8,5 +8,5 @@ LICENSE=metapackage
 RDEPEND=>=media-libs/gstreamer-0.10.36-r2:0.10[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(-)?] >=media-libs/gst-plugins-base-0.10.36:0.10[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(-)?] >=media-libs/gst-plugins-good-0.10.31:0.10[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(-)?] a52? ( >=media-plugins/gst-plugins-a52dec-0.10.19:0.10[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(-)?] ) aac? ( >=media-plugins/gst-plugins-faad-0.10.23:0.10[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(-)?] ) alsa? ( >=media-plugins/gst-plugins-alsa-0.10.36:0.10[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(-)?] ) cdda? ( || ( >=media-plugins/gst-plugins-cdparanoia-0.10.36:0.10[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(-)?] >=media-plugins/gst-plugins-cdio-0.10.19:0.10[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(-)?] ) ) dts? ( >=media-plugins/gst-plugins-dts-0.10.23:0.10[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(-)?] ) dv? ( >=media-plugins/gst-plugins-dv-0.10.31:0.10[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(-)?] ) dvb? ( >=media-plugins/gst-plugins-dvb-0.10.23:0.10[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(-)?] >=media-libs/gst-plugins-bad-0.10.23-r1:0.10[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(-)?] ) dvd? ( >=media-libs/gst-plugins-ugly-0.10.19:0.10[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(-)?] >=media-plugins/gst-plugins-a52dec-0.10.19:0.10[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(-)?] >=media-plugins/gst-plugins-dvdread-0.10.19:0.10[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(-)?] >=media-plugins/gst-plugins-mpeg2dec-0.10.19:0.10[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(-)?] >=media-plugins/gst-plugins-resindvd-0.10.23:0.10[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(-)?] ) ffmpeg? ( >=media-plugins/gst-plugins-ffmpeg-0.10.13_p201211:0.10[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(-)?] ) flac? ( >=media-plugins/gst-plugins-flac-0.10.31:0.10[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(-)?] ) http? ( >=media-plugins/gst-plugins-soup-0.10.31:0.10[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(-)?] ) jack? ( >=media-plugins/gst-plugins-jack-0.10.31:0.10[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(-)?] ) lame? ( >=media-plugins/gst-plugins-lame-0.10.19:0.10[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(-)?] ) libass? ( >=media-plugins/gst-plugins-assrender-0.10.23:0.10[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(-)?] ) libvisual? ( >=media-plugins/gst-plugins-libvisual-0.10.36:0.10[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(-)?] ) mms? ( >=media-plugins/gst-plugins-libmms-0.10.23:0.10[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(-)?] ) modplug? ( >=media-plugins/gst-plugins-modplug-0.10.23-r1:0.10[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(-)?] ) mp3? ( >=media-libs/gst-plugins-ugly-0.10.19:0.10[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(-)?] >=media-plugins/gst-plugins-mad-0.10.19:0.10[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(-)?] ) mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.10.19:0.10[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(-)?] ) musepack? ( >=media-plugins/gst-plugins-musepack-0.10.23:0.10[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(-)?] ) ogg? ( >=media-plugins/gst-plugins-ogg-0.10.36:0.10[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(-)?] ) opus? ( >=media-plugins/gst-plugins-opus-0.10.23:0.10[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(-)?] ) oss? ( >=media-plugins/gst-plugins-oss-0.10.31:0.10[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(-)?] ) pulseaudio? ( >=media-plugins/gst-plugins-pulse-0.10.31:0.10[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(-)?] ) theora? ( >=media-plugins/gst-plugins-theora-0.10.36-r1:0.10[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(-)?] ) taglib? ( >=media-plugins/gst-plugins-taglib-0.10.31:0.10[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(-)?] ) v4l? ( >=media-plugins/gst-plugins-v4l2-0.10.31:0.10[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(-)?] ) vcd? ( >=media-plugins/gst-plugins-mplex-0.10.23:0.10[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(-)?] >=media-plugins/gst-plugins-mpeg2dec-0.10.19:0.10[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(-)?] ) vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10.36:0.10[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(-)?] ) vpx? ( >=media-plugins/gst-plugins-vp8-0.10.23-r1:0.10[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(-)?] ) wavpack? ( >=media-plugins/gst-plugins-wavpack-0.10.31:0.10[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(-)?] ) X? ( >=media-plugins/gst-plugins-x-0.10.36:0.10[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(-)?] ) x264? ( >=media-plugins/gst-plugins-x264-0.10.19:0.10[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(-)?] ) xv? ( >=media-plugins/gst-plugins-xvideo-0.10.36:0.10[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(-)?] ) xvid? ( >=media-plugins/gst-plugins-xvid-0.10.23:0.10[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(-)?] )
 REQUIRED_USE=opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
 SLOT=0.10
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=5083fa67452a8bb35533fbca69909bc9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-meta-0.10-r9 b/metadata/md5-cache/media-plugins/gst-plugins-meta-0.10-r9
index 519a859393a6..f7743f16a445 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-meta-0.10-r9
+++ b/metadata/md5-cache/media-plugins/gst-plugins-meta-0.10-r9
@@ -8,5 +8,5 @@ LICENSE=metapackage
 RDEPEND=>=media-libs/gstreamer-0.10.36-r2:0.10[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(-)?] >=media-libs/gst-plugins-base-0.10.36:0.10[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(-)?] >=media-libs/gst-plugins-good-0.10.31:0.10[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(-)?] a52? ( >=media-plugins/gst-plugins-a52dec-0.10.19:0.10[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(-)?] ) aac? ( >=media-plugins/gst-plugins-faad-0.10.23:0.10[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(-)?] ) alsa? ( >=media-plugins/gst-plugins-alsa-0.10.36:0.10[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(-)?] ) cdda? ( || ( >=media-plugins/gst-plugins-cdparanoia-0.10.36:0.10[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(-)?] >=media-plugins/gst-plugins-cdio-0.10.19:0.10[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(-)?] ) ) dts? ( >=media-plugins/gst-plugins-dts-0.10.23:0.10[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(-)?] ) dv? ( >=media-plugins/gst-plugins-dv-0.10.31:0.10[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(-)?] ) dvb? ( >=media-plugins/gst-plugins-dvb-0.10.23:0.10[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(-)?] >=media-libs/gst-plugins-bad-0.10.23-r1:0.10[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(-)?] ) dvd? ( >=media-libs/gst-plugins-ugly-0.10.19:0.10[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(-)?] >=media-plugins/gst-plugins-a52dec-0.10.19:0.10[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(-)?] >=media-plugins/gst-plugins-dvdread-0.10.19:0.10[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(-)?] >=media-plugins/gst-plugins-mpeg2dec-0.10.19:0.10[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(-)?] >=media-plugins/gst-plugins-resindvd-0.10.23:0.10[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(-)?] ) ffmpeg? ( >=media-plugins/gst-plugins-ffmpeg-0.10.13_p201211:0.10[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(-)?] ) flac? ( >=media-plugins/gst-plugins-flac-0.10.31:0.10[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(-)?] ) http? ( >=media-plugins/gst-plugins-soup-0.10.31:0.10[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(-)?] ) jack? ( >=media-plugins/gst-plugins-jack-0.10.31:0.10[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(-)?] ) lame? ( >=media-plugins/gst-plugins-lame-0.10.19:0.10[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(-)?] ) libass? ( >=media-plugins/gst-plugins-assrender-0.10.23:0.10[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(-)?] ) libvisual? ( >=media-plugins/gst-plugins-libvisual-0.10.36:0.10[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(-)?] ) mms? ( >=media-plugins/gst-plugins-libmms-0.10.23:0.10[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(-)?] ) mp3? ( >=media-libs/gst-plugins-ugly-0.10.19:0.10[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(-)?] >=media-plugins/gst-plugins-mad-0.10.19:0.10[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(-)?] ) mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-0.10.19:0.10[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(-)?] ) musepack? ( >=media-plugins/gst-plugins-musepack-0.10.23:0.10[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(-)?] ) ogg? ( >=media-plugins/gst-plugins-ogg-0.10.36:0.10[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(-)?] ) opus? ( >=media-plugins/gst-plugins-opus-0.10.23:0.10[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(-)?] ) oss? ( >=media-plugins/gst-plugins-oss-0.10.31:0.10[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(-)?] ) pulseaudio? ( >=media-plugins/gst-plugins-pulse-0.10.31:0.10[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(-)?] ) theora? ( >=media-plugins/gst-plugins-theora-0.10.36-r1:0.10[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(-)?] ) taglib? ( >=media-plugins/gst-plugins-taglib-0.10.31:0.10[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(-)?] ) v4l? ( >=media-plugins/gst-plugins-v4l2-0.10.31:0.10[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(-)?] ) vcd? ( >=media-plugins/gst-plugins-mplex-0.10.23:0.10[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(-)?] >=media-plugins/gst-plugins-mpeg2dec-0.10.19:0.10[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(-)?] ) vorbis? ( >=media-plugins/gst-plugins-vorbis-0.10.36:0.10[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(-)?] ) vpx? ( >=media-plugins/gst-plugins-vp8-0.10.23-r1:0.10[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(-)?] ) wavpack? ( >=media-plugins/gst-plugins-wavpack-0.10.31:0.10[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(-)?] ) X? ( >=media-plugins/gst-plugins-x-0.10.36:0.10[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(-)?] ) x264? ( >=media-plugins/gst-plugins-x264-0.10.19:0.10[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(-)?] ) xv? ( >=media-plugins/gst-plugins-xvideo-0.10.36:0.10[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(-)?] ) xvid? ( >=media-plugins/gst-plugins-xvid-0.10.23:0.10[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(-)?] )
 REQUIRED_USE=opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
 SLOT=0.10
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=44f1c1241c241ba5674c0907c86f3469
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.0-r2 b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.0-r2
index 8076a21cdbb8..116b0bfcedec 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.0-r2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.0-r2
@@ -8,5 +8,5 @@ LICENSE=metapackage
 RDEPEND=>=media-libs/gstreamer-1.2.3:1.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(-)?] >=media-libs/gst-plugins-base-1.2.3:1.0[alsa?,ogg?,theora?,vorbis?,X?,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(-)?] >=media-libs/gst-plugins-good-1.2.3:1.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(-)?] a52? ( >=media-plugins/gst-plugins-a52dec-1.2.3:1.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(-)?] ) aac? ( >=media-plugins/gst-plugins-faad-1.2.3:1.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(-)?] ) cdda? ( || ( >=media-plugins/gst-plugins-cdparanoia-1.2.3:1.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(-)?] >=media-plugins/gst-plugins-cdio-1.2.3:1.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(-)?] ) ) dts? ( >=media-plugins/gst-plugins-dts-1.2.3:1.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(-)?] ) dv? ( >=media-plugins/gst-plugins-dv-1.2.3:1.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(-)?] ) dvb? ( >=media-plugins/gst-plugins-dvb-1.2.3:1.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(-)?] >=media-libs/gst-plugins-bad-1.2.3:1.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(-)?] ) dvd? ( >=media-libs/gst-plugins-ugly-1.2.3:1.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(-)?] >=media-plugins/gst-plugins-a52dec-1.2.3:1.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(-)?] >=media-plugins/gst-plugins-dvdread-1.2.3:1.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(-)?] >=media-plugins/gst-plugins-mpeg2dec-1.2.3:1.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(-)?] >=media-plugins/gst-plugins-resindvd-1.2.3:1.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(-)?] ) ffmpeg? ( >=media-plugins/gst-plugins-libav-1.1.0_pre20130128-r1:1.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(-)?] ) flac? ( >=media-plugins/gst-plugins-flac-1.2.3:1.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(-)?] ) http? ( >=media-plugins/gst-plugins-soup-1.2.3:1.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(-)?] ) jack? ( >=media-plugins/gst-plugins-jack-1.2.3:1.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(-)?] ) lame? ( >=media-plugins/gst-plugins-lame-1.2.3:1.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(-)?] ) libass? ( >=media-plugins/gst-plugins-assrender-1.2.3:1.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(-)?] ) libvisual? ( >=media-plugins/gst-plugins-libvisual-1.2.3:1.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(-)?] ) mms? ( >=media-plugins/gst-plugins-libmms-1.2.3:1.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(-)?] ) mp3? ( >=media-libs/gst-plugins-ugly-1.2.3:1.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(-)?] >=media-plugins/gst-plugins-mad-1.2.3:1.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(-)?] ) mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-1.2.3:1.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(-)?] ) opus? ( >=media-plugins/gst-plugins-opus-1.2.3:1.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(-)?] ) oss? ( >=media-plugins/gst-plugins-oss-1.2.3:1.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(-)?] ) pulseaudio? ( >=media-plugins/gst-plugins-pulse-1.2.3:1.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(-)?] ) taglib? ( >=media-plugins/gst-plugins-taglib-1.2.3:1.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(-)?] ) v4l? ( >=media-plugins/gst-plugins-v4l2-1.2.3:1.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(-)?] ) vcd? ( >=media-plugins/gst-plugins-mplex-1.2.3:1.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(-)?] >=media-plugins/gst-plugins-mpeg2dec-1.2.3:1.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(-)?] ) vpx? ( >=media-plugins/gst-plugins-vpx-1.2.3:1.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(-)?] ) wavpack? ( >=media-plugins/gst-plugins-wavpack-1.2.3:1.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(-)?] ) x264? ( >=media-plugins/gst-plugins-x264-1.2.3:1.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(-)?] )
 REQUIRED_USE=opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
 SLOT=1.0
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e265d40fc1ab5ab22e7644b71e30fd7b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.0-r3 b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.0-r3
index afdb13d7157f..6c82b98e32d4 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-meta-1.0-r3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-meta-1.0-r3
@@ -8,5 +8,5 @@ LICENSE=metapackage
 RDEPEND=>=media-libs/gstreamer-1.2.3:1.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(-)?] >=media-libs/gst-plugins-base-1.2.3:1.0[alsa?,ogg?,theora?,vorbis?,X?,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(-)?] >=media-libs/gst-plugins-good-1.2.3:1.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(-)?] a52? ( >=media-plugins/gst-plugins-a52dec-1.2.3:1.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(-)?] ) aac? ( >=media-plugins/gst-plugins-faad-1.2.3:1.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(-)?] ) cdda? ( || ( >=media-plugins/gst-plugins-cdparanoia-1.2.3:1.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(-)?] >=media-plugins/gst-plugins-cdio-1.2.3:1.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(-)?] ) ) dts? ( >=media-plugins/gst-plugins-dts-1.2.3:1.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(-)?] ) dv? ( >=media-plugins/gst-plugins-dv-1.2.3:1.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(-)?] ) dvb? ( >=media-plugins/gst-plugins-dvb-1.2.3:1.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(-)?] >=media-libs/gst-plugins-bad-1.2.3:1.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(-)?] ) dvd? ( >=media-libs/gst-plugins-ugly-1.2.3:1.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(-)?] >=media-plugins/gst-plugins-a52dec-1.2.3:1.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(-)?] >=media-plugins/gst-plugins-dvdread-1.2.3:1.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(-)?] >=media-plugins/gst-plugins-mpeg2dec-1.2.3:1.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(-)?] >=media-plugins/gst-plugins-resindvd-1.2.3:1.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(-)?] ) ffmpeg? ( >=media-plugins/gst-plugins-libav-1.1.0_pre20130128-r1:1.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(-)?] ) flac? ( >=media-plugins/gst-plugins-flac-1.2.3:1.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(-)?] ) http? ( >=media-plugins/gst-plugins-soup-1.2.3:1.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(-)?] ) jack? ( >=media-plugins/gst-plugins-jack-1.2.3:1.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(-)?] ) lame? ( >=media-plugins/gst-plugins-lame-1.2.3:1.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(-)?] ) libass? ( >=media-plugins/gst-plugins-assrender-1.2.3:1.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(-)?] ) libvisual? ( >=media-plugins/gst-plugins-libvisual-1.2.3:1.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(-)?] ) mms? ( >=media-plugins/gst-plugins-libmms-1.2.3:1.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(-)?] ) modplug? ( >=media-plugins/gst-plugins-modplug-1.2.4-r1:1.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(-)?] ) mp3? ( >=media-libs/gst-plugins-ugly-1.2.3:1.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(-)?] >=media-plugins/gst-plugins-mad-1.2.3:1.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(-)?] ) mpeg? ( >=media-plugins/gst-plugins-mpeg2dec-1.2.3:1.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(-)?] ) opus? ( >=media-plugins/gst-plugins-opus-1.2.3:1.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(-)?] ) oss? ( >=media-plugins/gst-plugins-oss-1.2.3:1.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(-)?] ) pulseaudio? ( >=media-plugins/gst-plugins-pulse-1.2.3:1.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(-)?] ) taglib? ( >=media-plugins/gst-plugins-taglib-1.2.3:1.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(-)?] ) v4l? ( >=media-plugins/gst-plugins-v4l2-1.2.3:1.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(-)?] ) vaapi? ( >=media-plugins/gst-plugins-vaapi-0.5.8-r1:1.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(-)?] ) vcd? ( >=media-plugins/gst-plugins-mplex-1.2.3:1.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(-)?] >=media-plugins/gst-plugins-mpeg2dec-1.2.3:1.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(-)?] ) vpx? ( >=media-plugins/gst-plugins-vpx-1.2.3:1.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(-)?] ) wavpack? ( >=media-plugins/gst-plugins-wavpack-1.2.3:1.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(-)?] ) x264? ( >=media-plugins/gst-plugins-x264-1.2.3:1.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(-)?] )
 REQUIRED_USE=opus? ( ogg ) theora? ( ogg ) vorbis? ( ogg )
 SLOT=1.0
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7908020a0abedf0642d4aea90ff4ad2e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mimic-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-mimic-0.10.23-r1
index 6be2fe40e1a6..59983e036b59 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mimic-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mimic-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmimic-1.0.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0d34894696cd2514b57f0cdce733b1fc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mimic-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-mimic-1.2.4-r1
index 592aab152c2c..a7697e3c9913 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mimic-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mimic-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmimic-1.0.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=69a91eea17b444ff717d2fca1e168bd1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mimic-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-mimic-1.4.5
index daa3d9c5b0b7..37cfb88d242c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mimic-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mimic-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmimic-1.0.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=27c3477aac6a182558e3e698d3543683
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-modplug-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-modplug-0.10.23-r1
index 762d6e905ca7..595e6259b9e0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-modplug-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-modplug-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c8e5630668c01f37a775aa5bea2869b2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.2.4-r1
index 6cfd0aa11c29..95cac11cb36e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=667c3248405031e525a783e560a4f3b1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.4.5
index 7868df8041ed..7bdbee8286a5 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-modplug-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d832e5c04aab1ee85a758cf9a6af87c6
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-0.10.19-r1 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-0.10.19-r1
index 1fcee52748e7..83be29485d5f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-0.10.19-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-0.10.19-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=502eacf80aab05ea1c4f36624b737756
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.2.4-r1
index a4b3b190beae..4e388593661f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=80e61294d1cec8ef4da5b80f161fa91c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.4.5
index 97725e9a24a9..b8e8117c28e6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2dec-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libmpeg2-0.5.1-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=78b1716e0f42c4861ca5a820c03e5c55
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-0.10.23-r1
index 8c213028bb6b..504289b085e7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=25106a2595e804332d89a4c445a866cd
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.2.4-r1
index 0bfc2934fa27..b0f7d03a0c20 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cbfce2a999d50a03f2b85d33931a6f8d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.4.5
index 6c67f9bd6017..fd0408458c1a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mpeg2enc-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5ed51d4ff8bf7a59b5da53a006c5c011
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mplex-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-mplex-0.10.23-r1
index 5e1186b85809..b91a7b16a13c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mplex-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mplex-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dc0d30f6cc280f6e4ff0e3a1202aa630
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.2.4-r1
index 671e859c38d3..9d453d3e91f0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fb20ea04676992d6eed4c4a38f990647
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.4.5
index fefa1f9892aa..4b978d781fc1 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-mplex-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/mjpegtools-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4993c5dbae23ff04e1b4d05fb57c7eb7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-musepack-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-musepack-0.10.23-r1
index cc8d740e66b3..126212348668 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-musepack-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-musepack-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/musepack-tools-465-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x8
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=43f2fd26fb1deda123c137cb02391aac
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-neon-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-neon-0.10.23-r1
index 86cea1014a4c..58f09614ebdb 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-neon-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-neon-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/neon-0.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ca0631137d7780f12bda3d01100c06c0
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.2.4-r1
index 14b0977fc8a5..dee11491c39a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-neon-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-neon-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/neon-0.30.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4f56a95f497539b3d9d607a83f11d596
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ofa-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-ofa-0.10.23-r1
index 2be15cb7ea17..2be382f5514d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ofa-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ofa-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3b6b50d50252fff4087f30aaeff2be56
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.2.4-r1
index 26fcccac3beb..f9aa1387c97d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=15db0b6a43a62dbd140e5744e303e7ca
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.4.5
index 47fd5b4a57d1..c9b0bbac8a8f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ofa-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libofa-0.9.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=33d52919f2e87a0fb6f077964ae36648
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ogg-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-ogg-0.10.36-r1
index cb353f493657..03605d3767c2 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ogg-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ogg-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e80f72c8ba34997d31b7fd679a181169
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opus-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-opus-0.10.23-r1
index 3b8020623aaf..a00fce447d9a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-opus-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opus-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/opus-1.0.2-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ca5076c2df96b8b65eb528e9dfa41dcc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.2.4-r1
index 5552ba864894..ef036f664057 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/opus-1.0.2-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fb064770c9f32966669b016551760221
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.4.5
index 9a820d47b16a..4802945a6b3d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-opus-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-opus-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/opus-1.0.2-r2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4b8a340f8b34cd15abe05f68f8937806
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-oss-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-oss-0.10.31-r1
index c0399c66675a..9d905cfc0b28 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-oss-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-oss-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f3e71bf0519829d7a1abe273bf842792
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.2.4-r1
index 764b8bece969..fd8078f8b37d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dd63fe3f95c2fbb489d39d32b40a57bc
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.4.5
index e5f40b7c9486..f165f3b81f98 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-oss-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-oss-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=753d8e13a9c9f0bc447f72bc2deeb62d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pango-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-pango-0.10.36-r1
index cc778362b856..a30e2d061eb3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-pango-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pango-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0f061511895da8be20a74b9afc72ca08
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pulse-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-pulse-0.10.31-r1
index 31e33d6ac48c..208b4a1a00b7 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-pulse-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pulse-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e933b4af42d7c557316fc019fc0ddd68
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.2.4-r1
index c459ff74e250..5e0bfd594e80 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a08b01a51b59cdfb6fa8b50bf95a4ef5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.4.5
index 67f3a3992e6a..84b4bf214ca0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-pulse-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=294f460729fc7b18cfaeab0c2d1a6234
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-0.10.31-r1
index 3ca29c239ae0..258fe36c3ff2 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=313151a71351b5851820aeb420433468
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.2.4-r1
index b3b379b0a68c..21761d52b68c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0a1cbd4867910d74e119d61820e49fde
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.4.5
index 19c88b918d01..b64e9728b450 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-raw1394-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=456b84d099a838a570fe7f96c6646611
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-0.10.23-r1
index 005c4228562b..3e82340e64c3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7b9f1cfca6b7efd5f5a7623a61d543b9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.2.4-r1
index 2ff342ff3eef..b9033d1e706a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1549056c6547e9b907a926a356f86f31
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.4.5
index b721342c1090..6f4d41ac768e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-resindvd-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libdvdnav-4.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=336b503cb8885e853a2500c44786a373
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-0.10.23-r1
index 8421ae0376f0..d4a49fde506c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=01b543dee1b15f7f8069e31e29d3131a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.2.4-r1
index 4ac530397be6..cb580d61ad6f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ccc9d188a395538f418a53ab3cdbf9ed
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.4.5
index 02b146e1879d..121ecaa6d6bf 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-rtmp-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=370bd6abde63da01ff4aa9cd27f338c0
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-schroedinger-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-schroedinger-0.10.23-r1
index 9759fe4ab4a6..2e9604f67e90 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-schroedinger-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-schroedinger-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x8
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3497446b408dd3458a1dd4e167ff8937
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-schroedinger-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-schroedinger-1.2.4-r1
index f54c80150e46..3823e1d6ace2 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-schroedinger-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-schroedinger-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x8
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=39008715e6d061ba6cd96384791cae1f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-schroedinger-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-schroedinger-1.4.5
index 4709a207e043..6e24c14da6f6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-schroedinger-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-schroedinger-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x8
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2384a8f5b5196e10baef0e094779ccd1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-shout2-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-shout2-0.10.31-r1
index b5c163afd55b..26145f965cdb 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-shout2-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-shout2-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bd26e8a80b6cfb2df2fa5fdbee96e87d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.2.4-r1
index efb7186479d4..0a91fdfbad0f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9acb55b05ae253532ee0f9703c6b2514
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.4.5
index 7c25a27ee249..4bdf848e61a1 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-shout2-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libshout-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bf76326bb0401182a09a74eef066aa7f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-0.10.19-r1 b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-0.10.19-r1
index 3607306163bc..be22459fe564 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-0.10.19-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-0.10.19-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=13f736ab0f5d9371da41226b79da5261
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.2.4-r1
index 3ca1ae3be06a..3cefe3f18b77 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a0bee54fe8bab34fc7b0ec29cb1a7cf0
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.4.5
index 4e4d4721abc8..1c3edd117755 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-sidplay-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsidplay-1.36.59-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=633dc7b88106ae0f6606ef870ec4b071
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.2.4-r1
index 93cc631fcec4..7bc1d4f0c592 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=501d25e768f28b849f214a770d6bf196
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.4.5
index 44c5ea4ad28e..ca9254b9b43c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-smoothstreaming-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=65624cc4b509583a34341890ab4de220
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-0.10.23-r1
index acab117fdd0d..0a100fe0411c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsoundtouch-1.7.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cf6cd0c07b4d73d2b2c88fd561dc88e9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.2.4-r1
index 4538b068d6c3..055bab35468f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsoundtouch-1.7.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2dfdd28e116d9327339bc8eb57ff9950
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.4.5
index 7609c85937d1..dccd02d673b0 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soundtouch-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libsoundtouch-1.7.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3402f321cd9143dbae78fa0d477dcf18
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soup-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-soup-0.10.31-r1
index f20acb51bf45..5237370d628b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soup-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soup-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libsoup-2.44.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f28c49b407e5661857c923d234ee524c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.2.4-r1
index 2bd9389d3630..c10126ab6212 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libsoup-2.44.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4917580b6927d425871f3a953790dc26
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.4.5
index adc679d3a4e8..43b929a13a60 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-soup-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-soup-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=net-libs/libsoup-2.44.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fa47dd9c326866231d6418e6d8da13e7
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-speex-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-speex-0.10.31-r1
index 5e74f4981f9f..bf203a30b58f 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-speex-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-speex-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9021c797fb7c0714d89e96e761e22fd5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.2.4-r1
index f753be73de02..23e39e168cb9 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e665fb5214267d7f0e3897aa74ac3406
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.4.5
index 0e1589e03f69..9d410c81f40e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-speex-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-speex-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b61130bb6fe280cca0e9e5e5dc37fe16
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-taglib-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-taglib-0.10.31-r1
index 001f032dbaba..91e1b893f9ba 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-taglib-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-taglib-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/taglib-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=94a390f9e6c5caded1f168bfec2f8f3d
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.2.4-r1
index 38e52b73796c..a67cccc7130e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/taglib-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b092b39cdbcd0c5aaee9712b4092bf8f
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.4.5
index 4388c5b61828..79b3080ba9c6 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-taglib-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/taglib-1.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=51611c300cddd5d9a84dbf92fa332373
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-theora-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-theora-0.10.36-r1
index 04fa1d70d2cc..cde8e8a17f57 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-theora-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-theora-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x8
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4b2510c8e5be80fc737615f6a9660aa3
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-twolame-0.10.19-r1 b/metadata/md5-cache/media-plugins/gst-plugins-twolame-0.10.19-r1
index 0af9fa488ea0..44b5abe049c3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-twolame-0.10.19-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-twolame-0.10.19-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b706d9606011b86f5a1149b5a7b75ccd
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.2.4-r1
index af4056a7aa23..f9053c722d23 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d5e07c41e6facdca92a40ebb9249af07
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.4.5
index c2575822aa05..e6197a9b45ce 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-twolame-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d3b43c66bcfd1e97d16611a8c6394937
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-0.10.31-r1
index 613f271a5f6d..c2d0c2182612 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bf5a60658a1aedd41a988ba2c08a9401
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.2.4-r1
index d12ce23e06ce..01f1be9b4c06 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7a3e7b8e64881df1381ef14f1d6cf4ee
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.4.5
index a91f46f13211..5e7114f79881 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-v4l2-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c64fb9e5b6aa715c1d3056964777c568
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vaapi-0.5.10 b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-0.5.10
index e207b3d47936..41f20c1b4b4a 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vaapi-0.5.10
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vaapi-0.5.10
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] media-libs/libvpx[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(-)?] >=media-libs/gstreamer-1.2.3:1.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(-)?] >=media-libs/gst-plugins-base-1.2.3:1.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(-)?] >=media-libs/gst-plugins-bad-1.2.3:1.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(-)?] >=x11-libs/libdrm-2.4.46[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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXrandr-1.4.2[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(-)?] >=x11-libs/libva-1.4.0[X?,opengl?,wayland?,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(-)?] >=virtual/opengl-7.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(-)?] >=virtual/libudev-208:=[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(-)?] wayland? ( >=dev-libs/wayland-1.0.6[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=1.0
 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/gstreamer-vaapi/gstreamer-vaapi-0.5.10.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e3ddd251982d58b7669a2f0260738968
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.2.4-r1
index 286356415f44..bba03bd52a02 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9d636ace9aef50142ac6edc9cfdd061c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.4.5
index d14e3a2584ca..f40cbc8e40e3 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voaacenc-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/vo-aacenc-0.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d70d106a491b85d8c19ddffc8883a3c2
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.2.4-r1
index f998c9c2079d..62437bf4e01e 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f0e73ffdf0f4e63b67cfefd6f4b0cf4b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.4.5
index 9932583feb1e..dab97e14958d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-voamrwbenc-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=800eadc338eb42c76affd6365863fbb1
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vorbis-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-vorbis-0.10.36-r1
index 594d9615917b..b32491431260 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vorbis-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vorbis-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=06ff1bd405422ee5bedb3854f2b8f8ca
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vp8-0.10.23-r2 b/metadata/md5-cache/media-plugins/gst-plugins-vp8-0.10.23-r2
index f3ad591e843a..3301bac58eab 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vp8-0.10.23-r2
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vp8-0.10.23-r2
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=47f5fd5a9e4787dca3bc45ba60b1892b
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vp8-0.10.23-r3 b/metadata/md5-cache/media-plugins/gst-plugins-vp8-0.10.23-r3
index 6f01ac12e361..09f71b27a891 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vp8-0.10.23-r3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vp8-0.10.23-r3
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libvpx-1.2.0_pre20130625[abi_x86_32(-)?,abi_x86_64(-)?,abi_
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=90b5e976707a0208ad780bb4260a850a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.2.4-r1
index 897cb443f86c..f8cdc58c600d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libvpx-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7b96879fc3cd66416dc6e484fa9b164a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.4.5
index a8634aea16c5..85183771082c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/libvpx-1.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ae2f8f05841f072ee616cfba10bbe537
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-0.10.31-r1
index 2d62a0e94a18..a94eede86380 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f5092f079095441b06c53b893ca5cf62
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.2.4-r1
index 31332ac7cf45..e6460a1feb4d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8c006e9ea669250747f165942c6ee93c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.4.5
index d1adff4776e3..ab249b9472dd 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-wavpack-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f68edb2b09cd03d641dde969d14a2d75
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.36-r1
index cf894c031706..402f65be0b5c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6414a773307466d3bd5cbd4c4bb2f96e
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x264-0.10.19-r1 b/metadata/md5-cache/media-plugins/gst-plugins-x264-0.10.19-r1
index b86cb3eb0eac..ec3a0331f07b 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x264-0.10.19-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x264-0.10.19-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=90225d00139a6c7585a9ffe0f80e33e9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.2.4-r1
index cf063c28b641..7116092a167d 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=87c97aeaec357b74151900594449a86c
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.4.5
index 1fe952527b86..61516f0cabb1 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-x264-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-x264-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f1290b687a1df0529699b33fb7dea243
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-0.10.31-r1 b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-0.10.31-r1
index f4fdaa32dcf5..47a8a2ac401c 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-0.10.31-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-0.10.31-r1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=87ab6da05c6f1db53a1fb3cc7e0e2d42
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.2.4-r1 b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.2.4-r1
index 220b6049e692..80e6bb5b55ae 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.2.4-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=07952d44d47ebe5bda2dab3b0dc2c3e9
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.4.5 b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.4.5
index 22a9618fd719..b4b767704567 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.4.5
+++ b/metadata/md5-cache/media-plugins/gst-plugins-ximagesrc-1.4.5
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 RESTRICT=test
 SLOT=1.0
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.4.5.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c81921c0ded9f49471c34694fefc5a09
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-xvid-0.10.23-r1 b/metadata/md5-cache/media-plugins/gst-plugins-xvid-0.10.23-r1
index f89d599fa1d0..4e1561d2b6ed 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-xvid-0.10.23-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-xvid-0.10.23-r1
@@ -10,5 +10,5 @@ RDEPEND=>=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8d2cfa7f4bf098d19d7c9aba2fbfcdc5
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.36-r1 b/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.36-r1
index 5c9faef3f0e2..643bf70fdbd1 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.36-r1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-xvideo-0.10.36-r1
@@ -10,5 +10,5 @@ RDEPEND=>=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 RESTRICT=test
 SLOT=0.10
 SRC_URI=http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gstreamer	0474e1ccd0ec25ab5b10fe5068e382d8	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e334399efff1f24c42908a48f3cbd7be
diff --git a/metadata/md5-cache/media-plugins/libvisual-plugins-0.4.0-r3 b/metadata/md5-cache/media-plugins/libvisual-plugins-0.4.0-r3
index 26b5be0e6da6..1fa4402260d2 100644
--- a/metadata/md5-cache/media-plugins/libvisual-plugins-0.4.0-r3
+++ b/metadata/md5-cache/media-plugins/libvisual-plugins-0.4.0-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/fontconfig-2.10.92[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(-)?] ~media-libs/libvisual-0.4.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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXrender-0.9.8[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(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[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(-)?] ) gtk? ( >=x11-libs/gtk+-2.24.23:2[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(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) opengl? ( >=virtual/glu-9.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(-)?] >=virtual/opengl-7.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=mirror://sourceforge/libvisual/libvisual-plugins-0.4.0.tar.gz mirror://gentoo/libvisual-plugins-0.4.0-patches-4.tar.bz2 mirror://gentoo/libvisual-plugins-0.4.0-m4-1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8be1e9dd91ee0693f419c5a878f9df81
diff --git a/metadata/md5-cache/media-plugins/live-2013.02.11 b/metadata/md5-cache/media-plugins/live-2013.02.11
index 61f5740f744a..47187d79e940 100644
--- a/metadata/md5-cache/media-plugins/live-2013.02.11
+++ b/metadata/md5-cache/media-plugins/live-2013.02.11
@@ -3,9 +3,9 @@ DESCRIPTION=Libraries for standards-based RTP/RTCP/RTSP multimedia streaming
 EAPI=3
 HOMEPAGE=http://www.live555.com/
 IUSE=examples static-libs
-KEYWORDS=~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://www.live555.com/liveMedia/public/live.2013.02.11.tar.gz mirror://gentoo/live.2013.02.11.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=8ff9094f658754ab90cb9ba793009e91
+_md5_=c5015f7aebc340ddcfdc3c89201da769
diff --git a/metadata/md5-cache/media-plugins/mythplugins-0.27.5_p20150627 b/metadata/md5-cache/media-plugins/mythplugins-0.27.5_p20150627
new file mode 100644
index 000000000000..d2f7d5c743ba
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/mythplugins-0.27.5_p20150627
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.27.5_p20150627*:=[alsa=,hls=,ieee1394=,libass=,python,theora=,vorbis=,xml=,xvid=] dev-libs/glib:= xml? ( >=dev-libs/libxml2-2.6.0:= ) dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4 dev-libs/openssl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) hls? ( media-libs/faac:= media-libs/libvpx:= >=media-libs/x264-0.0.20111220:= >=media-sound/lame-3.93.1 ) media-libs/freetype:= libass? ( >=media-libs/libass-0.9.11:= ) media-libs/libpng:= theora? ( media-libs/libtheora:= media-libs/libogg:= ) vorbis? ( media-libs/libogg:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) virtual/libudev:= ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) x11-libs/libX11:= sys-libs/zlib:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= fftw? ( sci-libs/fftw:= ) sys-apps/util-linux:= mythzoneminder? ( virtual/mysql ) mytharchive? ( app-cdr/dvd+rw-tools virtual/python-imaging:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/taglib-1.6:= vorbis? ( >=media-libs/libvorbis-1.0:= ) virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( =dev-lang/python-2*:=[xml] dev-python/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 >=dev-perl/DateTime-1 dev-perl/ImageSize dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) mythbrowser? ( dev-qt/qtwebkit:4 ) =dev-lang/python-2.7*
+DESCRIPTION=Official MythTV plugins
+EAPI=5
+HOMEPAGE=http://www.mythtv.org
+IUSE=mytharchive mythbrowser mythgallery mythgame mythmusic mythnetvision mythnews mythweather mythzoneminder alsa cdda cdr exif fftw hls ieee1394 libass raw theora vorbis xml xvid
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather =media-tv/mythtv-0.27.5_p20150627*:=[alsa=,hls=,ieee1394=,libass=,python,theora=,vorbis=,xml=,xvid=] dev-libs/glib:= xml? ( >=dev-libs/libxml2-2.6.0:= ) dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4 dev-libs/openssl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) hls? ( media-libs/faac:= media-libs/libvpx:= >=media-libs/x264-0.0.20111220:= >=media-sound/lame-3.93.1 ) media-libs/freetype:= libass? ( >=media-libs/libass-0.9.11:= ) media-libs/libpng:= theora? ( media-libs/libtheora:= media-libs/libogg:= ) vorbis? ( media-libs/libogg:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) virtual/libudev:= ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) x11-libs/libX11:= sys-libs/zlib:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= fftw? ( sci-libs/fftw:= ) sys-apps/util-linux:= mythzoneminder? ( virtual/mysql ) mytharchive? ( app-cdr/dvd+rw-tools virtual/python-imaging:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/taglib-1.6:= vorbis? ( >=media-libs/libvorbis-1.0:= ) virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( =dev-lang/python-2*:=[xml] dev-python/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/DateManip dev-perl/DateTime-Format-ISO8601 >=dev-perl/DateTime-1 dev-perl/ImageSize dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) mythbrowser? ( dev-qt/qtwebkit:4 ) =dev-lang/python-2.7*
+REQUIRED_USE=cdda? ( mythmusic ) cdr? ( mythmusic cdda ) exif? ( mythgallery ) fftw? ( mythmusic ) mythnews? ( mythbrowser ) raw? ( mythgallery )
+SLOT=0
+SRC_URI=https://github.com/MythTV/mythtv/archive/v0.27.5.tar.gz -> mythtv-0.27.5.tar.gz http://dev.gentoo.org/~rich0/distfiles/mythplugins-0.27.5-9498257571e8158926b60a0eefc74568c4436823.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=29a1fd2b0518851f1123e05bf70fe7ab
diff --git a/metadata/md5-cache/media-plugins/swh-plugins-0.4.15-r3 b/metadata/md5-cache/media-plugins/swh-plugins-0.4.15-r3
index b8bf99718cac..7a64d9999e08 100644
--- a/metadata/md5-cache/media-plugins/swh-plugins-0.4.15-r3
+++ b/metadata/md5-cache/media-plugins/swh-plugins-0.4.15-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-sound/gsm-1.0.13-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(-)?] >=sci-libs/fftw-3.3.3-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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://plugin.org.uk/releases/0.4.15/swh-plugins-0.4.15.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2b3a943ed250e709f6e5dedeed5cdde6
diff --git a/metadata/md5-cache/media-radio/xastir-2.0.6 b/metadata/md5-cache/media-radio/xastir-2.0.6
index b00f43adf5d6..13d21be747ce 100644
--- a/metadata/md5-cache/media-radio/xastir-2.0.6
+++ b/metadata/md5-cache/media-radio/xastir-2.0.6
@@ -4,10 +4,10 @@ DESCRIPTION=X Amateur Station Tracking and Information Reporting
 EAPI=5
 HOMEPAGE=http://xastir.sourceforge.net/
 IUSE=festival gdal geotiff graphicsmagick
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/motif-2.3:0 x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db:4.8 sci-libs/shapelib !graphicsmagick? ( media-gfx/imagemagick[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff:0 ) gdal? ( sci-libs/gdal ) festival? ( app-accessibility/festival )
 SLOT=0
 SRC_URI=mirror://sourceforge/xastir/xastir-2.0.6.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=7326e2339babf3bcd1f8b57ab0980f51
+_md5_=46d95c7a5ecb52522cb610f030b9347b
diff --git a/metadata/md5-cache/media-sound/apulse-0.1.4 b/metadata/md5-cache/media-sound/apulse-0.1.4
index cc87e9b72b3d..b14d4db6ac17 100644
--- a/metadata/md5-cache/media-sound/apulse-0.1.4
+++ b/metadata/md5-cache/media-sound/apulse-0.1.4
@@ -9,5 +9,5 @@ LICENSE=MIT LGPL-2.1
 RDEPEND=dev-libs/glib:2[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(-)?] media-libs/alsa-lib[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(-)?] !!media-plugins/alsa-plugins[pulseaudio]
 SLOT=0
 SRC_URI=https://github.com/i-rinat/apulse/archive/v0.1.4.tar.gz -> apulse-0.1.4.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=9fb2257c789960c2056256ed9d9b0a83
diff --git a/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r6 b/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r6
index d6f65282f8ae..962b39096be5 100644
--- a/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r6
+++ b/metadata/md5-cache/media-sound/cdparanoia-3.10.2-r6
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-eselect/eselect-cdparanoia abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r4 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz http://dev.gentoo.org/~ssuominen/cdparanoia-III-10.2-patches-2.tbz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=144b8cb51aeb1e772384f39ff833656d
diff --git a/metadata/md5-cache/media-sound/dcaenc-2-r1 b/metadata/md5-cache/media-sound/dcaenc-2-r1
index 42d1cd976ec6..4d75f2087c56 100644
--- a/metadata/md5-cache/media-sound/dcaenc-2-r1
+++ b/metadata/md5-cache/media-sound/dcaenc-2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=alsa? ( media-libs/alsa-lib[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
 SRC_URI=http://aepatrakov.narod.ru/olderfiles/1/dcaenc-2.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=5974b378808630058023c14f4f6ebdbe
diff --git a/metadata/md5-cache/media-sound/dcaenc-9999 b/metadata/md5-cache/media-sound/dcaenc-9999
index 439633d0b007..ba7737e310be 100644
--- a/metadata/md5-cache/media-sound/dcaenc-9999
+++ b/metadata/md5-cache/media-sound/dcaenc-9999
@@ -7,5 +7,5 @@ IUSE=alsa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o
 LICENSE=LGPL-2.1+
 RDEPEND=alsa? ( media-libs/alsa-lib[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
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1517d4dae52c4fd31a7143db4d42d176
diff --git a/metadata/md5-cache/media-sound/fluidsynth-1.1.6-r1 b/metadata/md5-cache/media-sound/fluidsynth-1.1.6-r1
index 6852c96bfc9f..c514a2d82a80 100644
--- a/metadata/md5-cache/media-sound/fluidsynth-1.1.6-r1
+++ b/metadata/md5-cache/media-sound/fluidsynth-1.1.6-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[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(-)?] lash? ( >=media-sound/lash-0.5.4-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(-)?] ) ) dbus? ( >=sys-apps/dbus-1.6.18-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(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) ladspa? ( >=media-libs/ladspa-sdk-1.13-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(-)?] >=media-libs/ladspa-cmt-1.16-r3[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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-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(-)?] ) readline? ( >=sys-libs/readline-6.2_p5-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(-)?] ) sndfile? ( >=media-libs/libsndfile-1.0.25[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
 SRC_URI=mirror://sourceforge/fluidsynth/fluidsynth-1.1.6.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ab5508a210eeb69c4f4e66e577bcd1b0
diff --git a/metadata/md5-cache/media-sound/gnac-0.2.4.1 b/metadata/md5-cache/media-sound/gnac-0.2.4.1
index 402ca1377b1d..428faa383e01 100644
--- a/metadata/md5-cache/media-sound/gnac-0.2.4.1
+++ b/metadata/md5-cache/media-sound/gnac-0.2.4.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=x11-libs/gtk+:3 dev-libs/libunique:3 dev-libs/libxml2:2 libnotify? ( x11-libs/libnotify ) >=media-libs/gstreamer-0.10.31:0.10 >=media-libs/gst-plugins-base-0.10.31:0.10 media-plugins/gst-plugins-gio:0.10 media-plugins/gst-plugins-meta:0.10[flac?,mp3?,wavpack?] aac? ( media-plugins/gst-plugins-faac:0.10 ) nls? ( virtual/libintl ) >=app-text/gnome-doc-utils-0.17.2 virtual/pkgconfig nls? ( sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=x11-libs/gtk+:3 dev-libs/libunique:3 dev-libs/libxml2:2 libnotify? ( x11-libs/libnotify ) >=media-libs/gstreamer-0.10.31:0.10 >=media-libs/gst-plugins-base-0.10.31:0.10 media-plugins/gst-plugins-gio:0.10 media-plugins/gst-plugins-meta:0.10[flac?,mp3?,wavpack?] aac? ( media-plugins/gst-plugins-faac:0.10 ) nls? ( virtual/libintl ) >=app-text/gnome-doc-utils-0.17.2 gnome-base/gnome-common virtual/pkgconfig nls? ( sys-devel/gettext ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=Audio converter for GNOME
-EAPI=4
+EAPI=5
 HOMEPAGE=http://gnac.sourceforge.net/
 IUSE=aac flac libnotify mp3 nls wavpack linguas_cs linguas_da linguas_de linguas_en_GB linguas_es linguas_gl linguas_fr linguas_he linguas_hu linguas_it linguas_lt linguas_nb linguas_pt_BR linguas_pl linguas_ro linguas_ru linguas_sl linguas_sv linguas_te linguas_tr linguas_zh_CN debug
 KEYWORDS=~amd64 ~x86
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/gtk+:3 dev-libs/libunique:3 dev-libs/libxml2:2 libnotify? ( x11
 SLOT=0
 SRC_URI=mirror://sourceforge/gnac/gnac-0.2.4.1.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9038344982fff6cae9d85d1f533a8277
+_md5_=031b53344439e71831579df22d2ba4ca
diff --git a/metadata/md5-cache/media-sound/gsm-1.0.13-r1 b/metadata/md5-cache/media-sound/gsm-1.0.13-r1
index 7385e043c2b1..f627d8a2e947 100644
--- a/metadata/md5-cache/media-sound/gsm-1.0.13-r1
+++ b/metadata/md5-cache/media-sound/gsm-1.0.13-r1
@@ -9,5 +9,5 @@ LICENSE=gsm
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gentoo/gsm-1.0.13.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3732e57ee255bd254e4b3800256239b3
diff --git a/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.121.3-r1 b/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.121.3-r1
index 877e9c30b3de..f15e3479468f 100644
--- a/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.121.3-r1
+++ b/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.121.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-libs/readline >=media-libs/libsndfile-1.0.0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[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(-)?] ) >=media-libs/libsamplerate-0.1.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(-)?] !media-sound/jack-cvs abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r7 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) alsa? ( sys-process/lsof ) pam? ( sys-auth/realtime-base )
 SLOT=0
 SRC_URI=http://www.jackaudio.org/downloads/jack-audio-connection-kit-0.121.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=32125a4676f5fa9af9773d3cc417b274
diff --git a/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.124.1 b/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.124.1
index 5b08b25419cf..ba16740d47d5 100644
--- a/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.124.1
+++ b/metadata/md5-cache/media-sound/jack-audio-connection-kit-0.124.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=sys-libs/readline >=media-libs/libsndfile-1.0.0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[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(-)?] ) >=media-libs/libsamplerate-0.1.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(-)?] !media-sound/jack-cvs abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r7 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) alsa? ( sys-process/lsof ) pam? ( sys-auth/realtime-base )
 SLOT=0
 SRC_URI=http://www.jackaudio.org/downloads/jack-audio-connection-kit-0.124.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ff59adcbc69769db093073a3e78d2a80
diff --git a/metadata/md5-cache/media-sound/jack-keyboard-2.5 b/metadata/md5-cache/media-sound/jack-keyboard-2.5
index 85f42b0ca50f..89e4f4076446 100644
--- a/metadata/md5-cache/media-sound/jack-keyboard-2.5
+++ b/metadata/md5-cache/media-sound/jack-keyboard-2.5
@@ -4,9 +4,9 @@ DESCRIPTION=A virtual MIDI keyboard for JACK MIDI
 EAPI=5
 HOMEPAGE=http://pin.if.uz.zgora.pl/~trasz/jack-keyboard/
 IUSE=lash X
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=public-domain
 RDEPEND=>=media-sound/jack-audio-connection-kit-0.103 >=x11-libs/gtk+-2.12:2 >=dev-libs/glib-2.2:2 lash? ( media-sound/lash ) X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=http://pin.if.uz.zgora.pl/~trasz/jack-keyboard/jack-keyboard-2.5.tar.gz
-_md5_=e97cad3be187633dd09417ca92837c8d
+_md5_=a41ac1d233c6fe38a077e65e18e5c310
diff --git a/metadata/md5-cache/media-sound/lame-3.99.5-r1 b/metadata/md5-cache/media-sound/lame-3.99.5-r1
index 304a7e841c04..75038dec8f92 100644
--- a/metadata/md5-cache/media-sound/lame-3.99.5-r1
+++ b/metadata/md5-cache/media-sound/lame-3.99.5-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-libs/ncurses-5.7-r7 sndfile? ( >=media-libs/libsndfile-1.0.2 ) abi_x86_32? ( !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/lame/lame-3.99.5.tar.gz mirror://gentoo/lame-3.99.5-automake-2.12.patch.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=dbde9565a039d9b25707ef2ec53ee7b5
diff --git a/metadata/md5-cache/media-sound/lash-0.5.4-r2 b/metadata/md5-cache/media-sound/lash-0.5.4-r2
index 085bde5f9a13..c4a3c2d124ea 100644
--- a/metadata/md5-cache/media-sound/lash-0.5.4-r2
+++ b/metadata/md5-cache/media-sound/lash-0.5.4-r2
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2 media-sound/jack-audio-connection-kit >=sys-apps/util-l
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://nongnu/lash/lash-0.5.4.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2509763982b6da9f19d9ced3728b18bb
diff --git a/metadata/md5-cache/media-sound/mpg123-1.18.1 b/metadata/md5-cache/media-sound/mpg123-1.18.1
index 570baddc4736..03fe04816ffe 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.18.1
+++ b/metadata/md5-cache/media-sound/mpg123-1.18.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-eselect/eselect-mpg123 >=sys-devel/libtool-2.2.6b alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r9 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.mpg123.org/download/mpg123-1.18.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=306a9593768e4261d2476a0e79ada395
diff --git a/metadata/md5-cache/media-sound/mpg123-1.19.0 b/metadata/md5-cache/media-sound/mpg123-1.19.0
index 7a7ffa9f8a90..e0f3a8547a05 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.19.0
+++ b/metadata/md5-cache/media-sound/mpg123-1.19.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-eselect/eselect-mpg123 >=sys-devel/libtool-2.2.6b alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r9 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.mpg123.org/download/mpg123-1.19.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=514c491f0e125c1551ac59719663bc93
diff --git a/metadata/md5-cache/media-sound/mpg123-1.20.0 b/metadata/md5-cache/media-sound/mpg123-1.20.0
index 09a7eb4fe8b9..47c71235d9c2 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.20.0
+++ b/metadata/md5-cache/media-sound/mpg123-1.20.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-eselect/eselect-mpg123 >=sys-devel/libtool-2.2.6b alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r9 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.mpg123.org/download/mpg123-1.20.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f6e60371ead54db67ac5906447d1e5e5
diff --git a/metadata/md5-cache/media-sound/mpg123-1.20.1 b/metadata/md5-cache/media-sound/mpg123-1.20.1
index 96a135523c02..873096b9e16a 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.20.1
+++ b/metadata/md5-cache/media-sound/mpg123-1.20.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-eselect/eselect-mpg123 >=sys-devel/libtool-2.2.6b alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r9 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.mpg123.org/download/mpg123-1.20.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ed6a603deafaeb8c1391b2c67c654a17
diff --git a/metadata/md5-cache/media-sound/mpg123-1.21.0 b/metadata/md5-cache/media-sound/mpg123-1.21.0
index 265a878056f8..c5e07490fdbb 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.21.0
+++ b/metadata/md5-cache/media-sound/mpg123-1.21.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-eselect/eselect-mpg123 >=sys-devel/libtool-2.2.6b alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r9 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.mpg123.org/download/mpg123-1.21.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=fe27b70a7d0f4f6b5a8fe8075370f2ec
diff --git a/metadata/md5-cache/media-sound/mpg123-1.22.0 b/metadata/md5-cache/media-sound/mpg123-1.22.0
index 1fff1fba6c0d..fabea3485401 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.22.0
+++ b/metadata/md5-cache/media-sound/mpg123-1.22.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-eselect/eselect-mpg123 || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r9 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.mpg123.org/download/mpg123-1.22.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1461cc4d73ba3ad19ca96e27c3d0ff9c
diff --git a/metadata/md5-cache/media-sound/mpg123-1.22.1 b/metadata/md5-cache/media-sound/mpg123-1.22.1
index 4e50f2333bcb..d06560d22a39 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.22.1
+++ b/metadata/md5-cache/media-sound/mpg123-1.22.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-eselect/eselect-mpg123 || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r9 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.mpg123.org/download/mpg123-1.22.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f74a2cd9b462b1f9f5ade901a7cc2ee1
diff --git a/metadata/md5-cache/media-sound/mpg123-1.22.2 b/metadata/md5-cache/media-sound/mpg123-1.22.2
index 9502042ae486..ada0052e42e8 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.22.2
+++ b/metadata/md5-cache/media-sound/mpg123-1.22.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=app-eselect/eselect-mpg123 || ( dev-libs/libltdl:0 <sys-devel/libtool-2.4.3-r2:2 ) alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r9 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.mpg123.org/download/mpg123-1.22.2.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1dd2a7ddd750d4dae82d0516dbda5817
diff --git a/metadata/md5-cache/media-sound/musepack-tools-465-r1 b/metadata/md5-cache/media-sound/musepack-tools-465-r1
index 5b933274e24b..dd021ed59ddc 100644
--- a/metadata/md5-cache/media-sound/musepack-tools-465-r1
+++ b/metadata/md5-cache/media-sound/musepack-tools-465-r1
@@ -9,5 +9,5 @@ LICENSE=BSD LGPL-2.1
 RDEPEND=>=media-libs/libcuefile-465[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(-)?] >=media-libs/libreplaygain-465[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-soundlibs-20130224-r5 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) !media-libs/libmpcdec !media-libs/libmpcdecsv7
 SLOT=0
 SRC_URI=mirror://gentoo/musepack-tools-465.tar.bz2
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7508541525f0c3afd7bbb5f15a57a38c
diff --git a/metadata/md5-cache/media-sound/pithos-1.0.0 b/metadata/md5-cache/media-sound/pithos-1.0.0
deleted file mode 100644
index 3154a6b8027c..000000000000
--- a/metadata/md5-cache/media-sound/pithos-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,-python_single_target_python3_3(-)]
-DESCRIPTION=Pandora.com client for the GNOME desktop
-EAPI=5
-HOMEPAGE=http://pithos.github.io/
-IUSE=libnotify appindicator +keybinder python_targets_python3_3
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] dev-python/dbus-python[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] dev-python/pygobject[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] dev-python/pylast[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] x11-libs/gtk+:3 media-libs/gstreamer:1.0[introspection] media-plugins/gst-plugins-meta:1.0[aac,http,mp3] libnotify? ( x11-libs/libnotify ) appindicator? ( dev-libs/libappindicator:3 ) keybinder? ( dev-libs/keybinder:3 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python3_3(-)?,-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python3_3 )
-SLOT=0
-SRC_URI=https://github.com/pithos/pithos/archive/1.0.0.tar.gz -> pithos-1.0.0.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=f7dee6a1e09110c56497d00bf1ccdb83
diff --git a/metadata/md5-cache/media-sound/pithos-1.1.1 b/metadata/md5-cache/media-sound/pithos-1.1.1
new file mode 100644
index 000000000000..499b29968fcf
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pithos-1.1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
+DESCRIPTION=Pandora.com client for the GNOME desktop
+EAPI=5
+HOMEPAGE=http://pithos.github.io/
+IUSE=libnotify appindicator +keybinder python_targets_python3_4
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/dbus-python[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/pygobject-3.12[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] x11-libs/pango[introspection] media-libs/gstreamer:1.0[introspection] media-plugins/gst-plugins-meta:1.0[aac,http,mp3] >=x11-libs/gtk+-3.14:3[introspection] x11-themes/gnome-icon-theme-symbolic libnotify? ( x11-libs/libnotify[introspection] ) appindicator? ( dev-libs/libappindicator:3[introspection] ) keybinder? ( dev-libs/keybinder:3[introspection] ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/pithos/pithos/archive/1.1.1.tar.gz -> pithos-1.1.1.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=2151da8631e6dc9816cd0bf88f9fc541
diff --git a/metadata/md5-cache/media-sound/pithos-9999 b/metadata/md5-cache/media-sound/pithos-9999
index 10581ac1c30e..ec53dd290d83 100644
--- a/metadata/md5-cache/media-sound/pithos-9999
+++ b/metadata/md5-cache/media-sound/pithos-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[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(-)] dev-vcs/git
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-vcs/git
 DESCRIPTION=Pandora.com client for the GNOME desktop
 EAPI=5
 HOMEPAGE=http://pithos.github.io/
-IUSE=libnotify appindicator +keybinder python_targets_python3_3 python_targets_python3_4
+IUSE=libnotify appindicator +keybinder python_targets_python3_4
 LICENSE=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/dbus-python[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pygobject[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-python/pylast[python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python3_3(-),-python_single_target_python3_4(-)] x11-libs/gtk+:3 media-libs/gstreamer:1.0[introspection] media-plugins/gst-plugins-meta:1.0[aac,http,mp3] libnotify? ( x11-libs/libnotify ) appindicator? ( dev-libs/libappindicator:3 ) keybinder? ( dev-libs/keybinder:3 ) 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 )
+RDEPEND=dev-python/setuptools[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] dev-python/dbus-python[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] >=dev-python/pygobject-3.12[python_targets_python3_4(-)?,-python_single_target_python3_4(-)] x11-libs/pango[introspection] media-libs/gstreamer:1.0[introspection] media-plugins/gst-plugins-meta:1.0[aac,http,mp3] >=x11-libs/gtk+-3.14:3[introspection] x11-themes/gnome-icon-theme-symbolic libnotify? ( x11-libs/libnotify[introspection] ) appindicator? ( dev-libs/libappindicator:3[introspection] ) keybinder? ( dev-libs/keybinder:3[introspection] ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python3_4 )
 SLOT=0
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=cde96e270f36fac2d57a294022c6abe7
+_md5_=6473455d486ae72dffaf51b0e40c8f6d
diff --git a/metadata/md5-cache/media-sound/pulseaudio-5.0-r4 b/metadata/md5-cache/media-sound/pulseaudio-5.0-r4
index 74d24b05fcee..d417ec592bbb 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-5.0-r4
+++ b/metadata/md5-cache/media-sound/pulseaudio-5.0-r4
@@ -11,5 +11,5 @@ RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-li
 REQUIRED_USE=bluetooth? ( dbus ) udev? ( || ( alsa oss ) )
 SLOT=0
 SRC_URI=http://freedesktop.org/software/pulseaudio/releases/pulseaudio-5.0.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8553d2611c83634cf807072cf6618373
diff --git a/metadata/md5-cache/media-sound/pulseaudio-5.0-r7 b/metadata/md5-cache/media-sound/pulseaudio-5.0-r7
index 19ea14b4e9be..7ee815754441 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-5.0-r7
+++ b/metadata/md5-cache/media-sound/pulseaudio-5.0-r7
@@ -11,5 +11,5 @@ RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-li
 REQUIRED_USE=bluetooth? ( dbus ) udev? ( || ( alsa oss ) )
 SLOT=0
 SRC_URI=http://freedesktop.org/software/pulseaudio/releases/pulseaudio-5.0.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cce13ca56f09d6fae2c0679556e89ba4
diff --git a/metadata/md5-cache/media-sound/pulseaudio-6.0 b/metadata/md5-cache/media-sound/pulseaudio-6.0
index f173009ec7e4..839ba29d4df0 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-6.0
+++ b/metadata/md5-cache/media-sound/pulseaudio-6.0
@@ -11,5 +11,5 @@ RDEPEND=|| ( elibc_glibc? ( virtual/libc ) elibc_uclibc? ( virtual/libc ) dev-li
 REQUIRED_USE=bluetooth? ( dbus ) ofono-headset? ( bluetooth ) native-headset? ( bluetooth ) udev? ( || ( alsa oss ) )
 SLOT=0
 SRC_URI=http://freedesktop.org/software/pulseaudio/releases/pulseaudio-6.0.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5277a2ae5e4f7c4992b0c856b9e00bdf
diff --git a/metadata/md5-cache/media-sound/timidity++-2.14.0-r2 b/metadata/md5-cache/media-sound/timidity++-2.14.0-r2
index a3605f6bd9f9..076551238bda 100644
--- a/metadata/md5-cache/media-sound/timidity++-2.14.0-r2
+++ b/metadata/md5-cache/media-sound/timidity++-2.14.0-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A handy MIDI to WAV converter with OSS and ALSA output support
 EAPI=5
 HOMEPAGE=http://timidity.sourceforge.net/
 IUSE=motif oss nas X gtk vorbis tk slang alsa jack emacs ao selinux speex flac ncurses
-KEYWORDS=~amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 PDEPEND=|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )
 RDEPEND=ncurses? ( >=sys-libs/ncurses-5 ) emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:2 ) tk? ( >=dev-lang/tk-8.5.13 ) nas? ( >=media-libs/nas-1.4 ) alsa? ( media-libs/alsa-lib ) slang? ( sys-libs/slang ) jack? ( media-sound/jack-audio-connection-kit ) vorbis? ( media-libs/libvorbis ) flac? ( media-libs/flac ) speex? ( media-libs/speex ) ao? ( >=media-libs/libao-0.8.5 ) motif? ( >=x11-libs/motif-2.3:0 ) X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 ) alsa? ( media-sound/alsa-utils ) app-eselect/eselect-timidity selinux? ( sec-policy/selinux-timidity )
 SLOT=0
 SRC_URI=mirror://sourceforge/timidity/TiMidity++-2.14.0.tar.xz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	elisp-common	9a16929c1a6aec7e1c903289983e114c	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=4b6d7bdc2541d1323ddb14ed5c8992a1
+_md5_=68b80a926f5a0828fc4e6e67bd6a1bea
diff --git a/metadata/md5-cache/media-sound/twolame-0.3.13-r1 b/metadata/md5-cache/media-sound/twolame-0.3.13-r1
index 44731f296938..70cd6cfbdbec 100644
--- a/metadata/md5-cache/media-sound/twolame-0.3.13-r1
+++ b/metadata/md5-cache/media-sound/twolame-0.3.13-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libsndfile-1.0.25[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-soundlibs-20130224-r6 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/twolame/twolame-0.3.13.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ab40e233e55a2ca599a06b7a9605bdce
diff --git a/metadata/md5-cache/media-sound/wavpack-4.60.1-r1 b/metadata/md5-cache/media-sound/wavpack-4.60.1-r1
index 09fdba0f8ef0..6cacdc22d83c 100644
--- a/metadata/md5-cache/media-sound/wavpack-4.60.1-r1
+++ b/metadata/md5-cache/media-sound/wavpack-4.60.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/libiconv-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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r4 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.wavpack.com/wavpack-4.60.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=9b5aa2f09c723dc2950b634f2272a741
diff --git a/metadata/md5-cache/media-sound/wavpack-4.70.0 b/metadata/md5-cache/media-sound/wavpack-4.70.0
index 44f3a7f62bf5..96be67c9afb8 100644
--- a/metadata/md5-cache/media-sound/wavpack-4.70.0
+++ b/metadata/md5-cache/media-sound/wavpack-4.70.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=virtual/libiconv-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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r4 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.wavpack.com/wavpack-4.70.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c5716a70fdac910ce0f717b5e1e205c9
diff --git a/metadata/md5-cache/media-tv/mythtv-0.27.5_p20150627 b/metadata/md5-cache/media-tv/mythtv-0.27.5_p20150627
new file mode 100644
index 000000000000..5964ce0bf26c
--- /dev/null
+++ b/metadata/md5-cache/media-tv/mythtv-0.27.5_p20150627
@@ -0,0 +1,14 @@
+DEFINED_PHASES=config configure info install postinst postrm preinst prepare setup
+DEPEND=>=media-libs/freetype-2.0:= sys-libs/zlib:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXv:= x11-libs/libXrandr:= x11-libs/libXxf86vm:= >=dev-qt/qtcore-4.7.2:4= >=dev-qt/qtdbus-4.7.2:4= >=dev-qt/qtgui-4.7.2:4= >=dev-qt/qtscript-4.7.2:4= >=dev-qt/qtsql-4.7.2:4=[mysql] >=dev-qt/qtopengl-4.7.2:4=[egl?] >=dev-qt/qtwebkit-4.7.2:4= x11-misc/wmctrl:= virtual/mysql virtual/opengl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= ) cec? ( dev-libs/libcec:= ) dvb? ( media-libs/libdvb:= virtual/linuxtv-dvb-headers:= ) dvd? ( dev-libs/libcdio:= ) egl? ( media-libs/mesa:=[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( media-libs/faac:= media-libs/libvpx:= >=media-libs/x264-0.0.20111220:= >=media-sound/lame-3.93.1 ) ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( dev-perl/DBD-mysql dev-perl/Net-UPnP dev-perl/LWP-Protocol-https dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 >=dev-perl/libwww-perl-5 ) pulseaudio? ( media-sound/pulseaudio ) python? ( dev-python/mysql-python dev-python/lxml dev-python/urlgrabber ) raop? ( dev-libs/openssl:= net-dns/avahi[mdnsresponder-compat] ) theora? ( media-libs/libtheora:= media-libs/libogg:= ) vaapi? ( x11-libs/libva:= ) vdpau? ( x11-libs/libvdpau:= ) vorbis? ( >=media-libs/libvorbis-1.0:= media-libs/libogg:= ) xml? ( >=dev-libs/libxml2-2.6.0:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) !media-tv/mythtv-bindings !x11-themes/mythtv-themes media-libs/taglib:= dev-libs/glib:= dev-lang/yasm x11-proto/xineramaproto x11-proto/xf86vidmodeproto python? ( =dev-lang/python-2.7* ) virtual/pkgconfig
+DESCRIPTION=Homebrew PVR project
+EAPI=5
+HOMEPAGE=http://www.mythtv.org
+IUSE=alsa altivec libass autostart bluray cec crystalhd debug dvb dvd egl fftw +hls ieee1394 jack lcd lirc perl pulseaudio python raop +theora vaapi vdpau +vorbis +wrapper +xml xmltv +xvid input_devices_joystick
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/freetype-2.0:= sys-libs/zlib:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXv:= x11-libs/libXrandr:= x11-libs/libXxf86vm:= >=dev-qt/qtcore-4.7.2:4= >=dev-qt/qtdbus-4.7.2:4= >=dev-qt/qtgui-4.7.2:4= >=dev-qt/qtscript-4.7.2:4= >=dev-qt/qtsql-4.7.2:4=[mysql] >=dev-qt/qtopengl-4.7.2:4=[egl?] >=dev-qt/qtwebkit-4.7.2:4= x11-misc/wmctrl:= virtual/mysql virtual/opengl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) bluray? ( dev-libs/libcdio:= media-libs/libbluray:= ) cec? ( dev-libs/libcec:= ) dvb? ( media-libs/libdvb:= virtual/linuxtv-dvb-headers:= ) dvd? ( dev-libs/libcdio:= ) egl? ( media-libs/mesa:=[egl] ) fftw? ( sci-libs/fftw:3.0= ) hls? ( media-libs/faac:= media-libs/libvpx:= >=media-libs/x264-0.0.20111220:= >=media-sound/lame-3.93.1 ) ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) jack? ( media-sound/jack-audio-connection-kit ) lcd? ( app-misc/lcdproc ) libass? ( >=media-libs/libass-0.9.11:= ) lirc? ( app-misc/lirc ) perl? ( dev-perl/DBD-mysql dev-perl/Net-UPnP dev-perl/LWP-Protocol-https dev-perl/HTTP-Message dev-perl/IO-Socket-INET6 >=dev-perl/libwww-perl-5 ) pulseaudio? ( media-sound/pulseaudio ) python? ( dev-python/mysql-python dev-python/lxml dev-python/urlgrabber ) raop? ( dev-libs/openssl:= net-dns/avahi[mdnsresponder-compat] ) theora? ( media-libs/libtheora:= media-libs/libogg:= ) vaapi? ( x11-libs/libva:= ) vdpau? ( x11-libs/libvdpau:= ) vorbis? ( >=media-libs/libvorbis-1.0:= media-libs/libogg:= ) xml? ( >=dev-libs/libxml2-2.6.0:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) !media-tv/mythtv-bindings !x11-themes/mythtv-themes media-libs/taglib:= dev-libs/glib:= media-fonts/corefonts media-fonts/dejavu media-fonts/liberation-fonts x11-apps/xinit autostart? ( net-dialup/mingetty x11-wm/evilwm x11-apps/xset ) dvd? ( media-libs/libdvdcss:= ) xmltv? ( >=media-tv/xmltv-0.5.43 ) python? ( =dev-lang/python-2.7* )
+REQUIRED_USE=bluray? ( xml ) theora? ( vorbis )
+SLOT=0
+SRC_URI=https://github.com/MythTV/mythtv/archive/v0.27.5.tar.gz -> mythtv-0.27.5.tar.gz http://dev.gentoo.org/~rich0/distfiles/mythtv-0.27.5-9498257571e8158926b60a0eefc74568c4436823.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	python	3a270b7b1d1e679847ff0faeac25c5a3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=e1053a9e15ee4d549f3bdfbdd3cd5c82
diff --git a/metadata/md5-cache/media-tv/v4l-utils-1.6.2 b/metadata/md5-cache/media-tv/v4l-utils-1.6.2
index 0ce4a0a803dd..8c03cf2a8e3f 100644
--- a/metadata/md5-cache/media-tv/v4l-utils-1.6.2
+++ b/metadata/md5-cache/media-tv/v4l-utils-1.6.2
@@ -4,10 +4,10 @@ DESCRIPTION=Separate utilities ebuild from upstream v4l-utils package
 EAPI=5
 HOMEPAGE=http://git.linuxtv.org/v4l-utils.git
 IUSE=qt4 udev
-KEYWORDS=~amd64 ~arm ~ppc ~x86
+KEYWORDS=amd64 ~arm ~ppc x86
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=media-libs/libv4l-1.6.2 qt4? ( dev-qt/qtgui:4 dev-qt/qtopengl:4 virtual/opengl media-libs/alsa-lib ) udev? ( virtual/libudev ) !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
 SLOT=0
 SRC_URI=http://linuxtv.org/downloads/v4l-utils/v4l-utils-1.6.2.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438
-_md5_=9b9a45b41620c3267ceadc81ef590934
+_md5_=26d76f8212be5b39766fa511dd6195ff
diff --git a/metadata/md5-cache/media-video/aegisub-3.1.3 b/metadata/md5-cache/media-video/aegisub-3.1.3
index 3c14b8db0f1c..181fdc81b199 100644
--- a/metadata/md5-cache/media-video/aegisub-3.1.3
+++ b/metadata/md5-cache/media-video/aegisub-3.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced SSA/ASS subtitle editor
 EAPI=5
 HOMEPAGE=http://www.aegisub.org/
 IUSE=alsa debug +ffmpeg +fftw openal oss portaudio pulseaudio spell linguas_ar linguas_bg linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_es linguas_eu linguas_fa linguas_fi linguas_fr_FR linguas_gl linguas_hu linguas_id linguas_it linguas_ja linguas_ko linguas_nl linguas_pl linguas_pt_BR linguas_pt_PT linguas_ru linguas_sr_RS@latin linguas_sr_RS linguas_vi linguas_zh_CN linguas_zh_TW
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=BSD
 RDEPEND=>=x11-libs/wxGTK-3.0.0:3.0[X,opengl,debug?] virtual/opengl virtual/glu >=media-libs/libass-0.10.0[fontconfig] virtual/libiconv >=dev-libs/boost-1.53.0:=[icu,nls,threads] >=dev-libs/icu-4.8.1.1:= >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2.3.5:2 alsa? ( >=media-libs/alsa-lib-1.0.16 ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( >=media-sound/pulseaudio-0.9.5 ) openal? ( media-libs/openal ) spell? ( >=app-text/hunspell-1.2.2 ) ffmpeg? ( >=media-libs/ffmpegsource-2.17:= ) fftw? ( >=sci-libs/fftw-3.3 )
 REQUIRED_USE=|| ( alsa openal oss portaudio pulseaudio )
 SLOT=0
 SRC_URI=http://ftp.aegisub.org/pub/releases/aegisub-3.1.3.tar.xz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	l10n	33bde4fb0cfd3a21a277b66bfd837e19	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=57930c4b13f36d5f4f30eaa7a174dbee
+_md5_=5010f2d669da7eeddb968c7a0869a56a
diff --git a/metadata/md5-cache/media-video/dirac-1.0.2-r1 b/metadata/md5-cache/media-video/dirac-1.0.2-r1
index 7079218c35c8..5483cdbd6f92 100644
--- a/metadata/md5-cache/media-video/dirac-1.0.2-r1
+++ b/metadata/md5-cache/media-video/dirac-1.0.2-r1
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fb
 LICENSE=MPL-1.1
 SLOT=0
 SRC_URI=mirror://sourceforge/dirac/dirac-1.0.2.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=cb8cc0f6e2aa6459b865aa6f2114404b
diff --git a/metadata/md5-cache/media-video/ffmpeg-0.10.16 b/metadata/md5-cache/media-video/ffmpeg-0.10.16
index 777ae84fcafc..2bb901a3c326 100644
--- a/metadata/md5-cache/media-video/ffmpeg-0.10.16
+++ b/metadata/md5-cache/media-video/ffmpeg-0.10.16
@@ -11,5 +11,5 @@ REQUIRED_USE=libv4l? ( v4l ) test? ( encode zlib )
 RESTRICT=encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )
 SLOT=0.10
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-0.10.16.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e59531de0a89a26fb6eefbea112df702
diff --git a/metadata/md5-cache/media-video/ffmpeg-1.2.12 b/metadata/md5-cache/media-video/ffmpeg-1.2.12
index 3806a922fd51..4d99ee49464c 100644
--- a/metadata/md5-cache/media-video/ffmpeg-1.2.12
+++ b/metadata/md5-cache/media-video/ffmpeg-1.2.12
@@ -11,5 +11,5 @@ REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode )
 RESTRICT=encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )
 SLOT=0
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-1.2.12.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e1f2379c49fa7b2bbcf1b19475fe3eb3
diff --git a/metadata/md5-cache/media-video/ffmpeg-1.2.6-r1 b/metadata/md5-cache/media-video/ffmpeg-1.2.6-r1
index 290729674cd9..95f44aac435a 100644
--- a/metadata/md5-cache/media-video/ffmpeg-1.2.6-r1
+++ b/metadata/md5-cache/media-video/ffmpeg-1.2.6-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode )
 RESTRICT=encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )
 SLOT=0
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-1.2.6.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c691b587e42150d87486f5ff66f3796b
diff --git a/metadata/md5-cache/media-video/ffmpeg-2.2.14 b/metadata/md5-cache/media-video/ffmpeg-2.2.14
index ca4eb137e476..b26175830c6a 100644
--- a/metadata/md5-cache/media-video/ffmpeg-2.2.14
+++ b/metadata/md5-cache/media-video/ffmpeg-2.2.14
@@ -11,5 +11,5 @@ REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode )
 RESTRICT=encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )
 SLOT=0/52.55.55
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-2.2.14.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=9fdf615dd629a58ec9c2ad0f22bf1659
diff --git a/metadata/md5-cache/media-video/ffmpeg-2.2.15 b/metadata/md5-cache/media-video/ffmpeg-2.2.15
index e079cce55b78..10c6f493587d 100644
--- a/metadata/md5-cache/media-video/ffmpeg-2.2.15
+++ b/metadata/md5-cache/media-video/ffmpeg-2.2.15
@@ -11,5 +11,5 @@ REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode )
 RESTRICT=encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )
 SLOT=0/52.55.55
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-2.2.15.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=42d97620f7f99b995af4631da7cd8128
diff --git a/metadata/md5-cache/media-video/ffmpeg-2.2.16 b/metadata/md5-cache/media-video/ffmpeg-2.2.16
index f6cee8f37d94..5ebf7b5fd053 100644
--- a/metadata/md5-cache/media-video/ffmpeg-2.2.16
+++ b/metadata/md5-cache/media-video/ffmpeg-2.2.16
@@ -11,5 +11,5 @@ REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode )
 RESTRICT=encode? ( faac? ( bindist ) aacplus? ( bindist ) ) openssl? ( bindist )
 SLOT=0/52.55.55
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-2.2.16.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=963a6fb21d94abcf621f578fe1deaae9
diff --git a/metadata/md5-cache/media-video/ffmpeg-2.6.3 b/metadata/md5-cache/media-video/ffmpeg-2.6.3
index c8790e9b7f2b..3e6925e7cca5 100644
--- a/metadata/md5-cache/media-video/ffmpeg-2.6.3
+++ b/metadata/md5-cache/media-video/ffmpeg-2.6.3
@@ -4,12 +4,12 @@ DESCRIPTION=Complete solution to record, convert and stream audio and video. Inc
 EAPI=5
 HOMEPAGE=http://ffmpeg.org/
 IUSE=alsa +encode examples jack oss pic static-libs test v4l +bzip2 cpudetection debug doc gnutls +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio amr amr fdk jpeg2k bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi bs2b flite frei0r fribidi fontconfig ladspa libass truetype libsoxr +threads aac amrenc mp3 aacplus faac theora twolame wavpack webp x264 x265 xvid armv5te armv6 armv6t2 neon armvfp mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_trasher 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( aac? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[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(-)?] ) amr? ( >=media-libs/opencore-amr-0.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(-)?] ) bluray? ( >=media-libs/libbluray-0.3.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(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.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(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-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(-)?] ) celt? ( >=media-libs/celt-0.11.1-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(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[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(-)?] ) aacplus? ( >=media-libs/libaacplus-2.0.2-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(-)?] ) amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-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(-)?] ) faac? ( >=media-libs/faac-1.28-r3[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(-)?] ) mp3? ( >=media-sound/lame-3.99.5-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(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,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(-)?] >=media-libs/libogg-1.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(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-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(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-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(-)?] ) webp? ( >=media-libs/libwebp-0.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(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[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(-)?] ) x265? ( >=media-libs/x265-1.2:=[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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-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(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[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(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[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(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[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(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-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(-)?] ) iconv? ( >=virtual/libiconv-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(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.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(-)?] >=sys-libs/libraw1394-2.1.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(-)?] >=sys-libs/libavc1394-0.5.4-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(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[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(-)?] >=sys-libs/libraw1394-2.1.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(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0: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(-)?] ) libass? ( >=media-libs/libass-0.10.2[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(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.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(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-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(-)?] ) openal? ( >=media-libs/openal-1.15.1[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(-)?] ) opengl? ( >=virtual/opengl-7.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(-)?] ) openssl? ( >=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(-)?] ) opus? ( >=media-libs/opus-1.0.2-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) quvi? ( media-libs/libquvi:0.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(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[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(-)?] ) samba? ( >=net-fs/samba-3.6.23-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(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-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(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,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(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[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(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-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(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[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(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.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(-)?] >=media-libs/libogg-1.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(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] !xcb? ( >=x11-libs/libXfixes-5.0.1[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(-)?] ) >=x11-libs/libXv-1.0.10[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(-)?] ) xcb? ( >=x11-libs/libxcb-1.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(-)?] ) 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(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[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(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) zvbi? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
 RESTRICT=encode? ( faac? ( bindist ) aacplus? ( bindist ) ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 SLOT=0/54.56.56
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-2.6.3.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=78799885335785e8deff0930aa21d6a6
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=40ef919ae3cd2ac132b8af7151d921b6
diff --git a/metadata/md5-cache/media-video/ffmpeg-2.7 b/metadata/md5-cache/media-video/ffmpeg-2.7
index 3c0af7ed383f..b4e2046cf63e 100644
--- a/metadata/md5-cache/media-video/ffmpeg-2.7
+++ b/metadata/md5-cache/media-video/ffmpeg-2.7
@@ -11,5 +11,5 @@ REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc
 RESTRICT=encode? ( faac? ( bindist ) aacplus? ( bindist ) ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 SLOT=0/54.56.56
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-2.7.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=20b7d592dbc373ed428eb43283837cab
diff --git a/metadata/md5-cache/media-video/ffmpeg-2.7.1 b/metadata/md5-cache/media-video/ffmpeg-2.7.1
index 5017129ef58a..d483cc7223e3 100644
--- a/metadata/md5-cache/media-video/ffmpeg-2.7.1
+++ b/metadata/md5-cache/media-video/ffmpeg-2.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc
 RESTRICT=encode? ( faac? ( bindist ) aacplus? ( bindist ) ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 SLOT=0/54.56.56
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-2.7.1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=9ffe1141db37f5fe583d10ec257b4042
diff --git a/metadata/md5-cache/media-video/ffmpeg-9999 b/metadata/md5-cache/media-video/ffmpeg-9999
index a03d226a540e..5469bdff4b21 100644
--- a/metadata/md5-cache/media-video/ffmpeg-9999
+++ b/metadata/md5-cache/media-video/ffmpeg-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[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(-)?] ) amr? ( >=media-libs/opencore-amr-0.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(-)?] ) bluray? ( >=media-libs/libbluray-0.3.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(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.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(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-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(-)?] ) celt? ( >=media-libs/celt-0.11.1-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(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[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(-)?] ) aacplus? ( >=media-libs/libaacplus-2.0.2-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(-)?] ) amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-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(-)?] ) faac? ( >=media-libs/faac-1.28-r3[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(-)?] ) mp3? ( >=media-sound/lame-3.99.5-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(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,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(-)?] >=media-libs/libogg-1.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(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-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(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-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(-)?] ) webp? ( >=media-libs/libwebp-0.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(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[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(-)?] ) x265? ( >=media-libs/x265-1.6:=[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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-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(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[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(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[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(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[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(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-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(-)?] ) iconv? ( >=virtual/libiconv-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(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.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(-)?] >=sys-libs/libraw1394-2.1.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(-)?] >=sys-libs/libavc1394-0.5.4-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(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[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(-)?] >=sys-libs/libraw1394-2.1.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(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0: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(-)?] ) libass? ( >=media-libs/libass-0.10.2[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(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.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(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-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(-)?] ) openal? ( >=media-libs/openal-1.15.1[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(-)?] ) opengl? ( >=virtual/opengl-7.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(-)?] ) openssl? ( >=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(-)?] ) opus? ( >=media-libs/opus-1.0.2-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) quvi? ( media-libs/libquvi:0.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(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[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(-)?] ) samba? ( >=net-fs/samba-3.6.23-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(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-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(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,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(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[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(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-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(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[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(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.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(-)?] >=media-libs/libogg-1.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(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] !xcb? ( >=x11-libs/libXfixes-5.0.1[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(-)?] ) >=x11-libs/libXv-1.0.10[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(-)?] ) xcb? ( >=x11-libs/libxcb-1.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(-)?] ) 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(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[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(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) >=sys-devel/make-3.81 doc? ( app-text/texi2html ) fontconfig? ( >=virtual/pkgconfig-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(-)?] ) gnutls? ( >=virtual/pkgconfig-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(-)?] ) ieee1394? ( >=virtual/pkgconfig-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(-)?] ) ladspa? ( >=media-libs/ladspa-sdk-1.13-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(-)?] ) libv4l? ( >=virtual/pkgconfig-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(-)?] ) cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 ) rtmp? ( >=virtual/pkgconfig-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(-)?] ) schroedinger? ( >=virtual/pkgconfig-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(-)?] ) test? ( net-misc/wget sys-devel/bc ) truetype? ( >=virtual/pkgconfig-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(-)?] ) v4l? ( sys-kernel/linux-headers ) dev-vcs/git
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[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(-)?] ) amr? ( >=media-libs/opencore-amr-0.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(-)?] ) bluray? ( >=media-libs/libbluray-0.3.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(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.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(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-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(-)?] ) celt? ( >=media-libs/celt-0.11.1-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(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[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(-)?] ) aacplus? ( >=media-libs/libaacplus-2.0.2-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(-)?] ) amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-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(-)?] ) faac? ( >=media-libs/faac-1.28-r3[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(-)?] ) mp3? ( >=media-sound/lame-3.99.5-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(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-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(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,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(-)?] >=media-libs/libogg-1.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(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-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(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-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(-)?] ) webp? ( >=media-libs/libwebp-0.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(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[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(-)?] ) x265? ( >=media-libs/x265-1.6:=[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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-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(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[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(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[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(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[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(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-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(-)?] ) iconv? ( >=virtual/libiconv-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(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.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(-)?] >=sys-libs/libraw1394-2.1.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(-)?] >=sys-libs/libavc1394-0.5.4-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(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[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(-)?] >=sys-libs/libraw1394-2.1.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(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0: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(-)?] ) libass? ( >=media-libs/libass-0.10.2[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(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.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(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-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(-)?] ) openal? ( >=media-libs/openal-1.15.1[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(-)?] ) opengl? ( >=virtual/opengl-7.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(-)?] ) openssl? ( >=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(-)?] ) opus? ( >=media-libs/opus-1.0.2-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) quvi? ( media-libs/libquvi:0.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(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[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(-)?] ) samba? ( >=net-fs/samba-3.6.23-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(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-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(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,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(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[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(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-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(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[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(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.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(-)?] >=media-libs/libogg-1.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(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] !xcb? ( >=x11-libs/libXfixes-5.0.1[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(-)?] ) >=x11-libs/libXv-1.0.10[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(-)?] ) xcb? ( >=x11-libs/libxcb-1.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(-)?] ) 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(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[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(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) >=sys-devel/make-3.81 doc? ( app-text/texi2html ) fontconfig? ( >=virtual/pkgconfig-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(-)?] ) gnutls? ( >=virtual/pkgconfig-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(-)?] ) ieee1394? ( >=virtual/pkgconfig-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(-)?] ) ladspa? ( >=media-libs/ladspa-sdk-1.13-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(-)?] ) libv4l? ( >=virtual/pkgconfig-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(-)?] ) cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 ) rtmp? ( >=virtual/pkgconfig-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(-)?] ) schroedinger? ( >=virtual/pkgconfig-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(-)?] ) test? ( net-misc/wget sys-devel/bc ) truetype? ( >=virtual/pkgconfig-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(-)?] ) v4l? ( sys-kernel/linux-headers ) dev-vcs/git
 DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
 EAPI=5
 HOMEPAGE=http://ffmpeg.org/
-IUSE=alsa +encode examples jack oss pic static-libs test v4l +bzip2 cpudetection debug doc gnutls +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio amr amr fdk jpeg2k bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi bs2b flite frei0r fribidi fontconfig ladspa libass truetype libsoxr +threads aac amrenc mp3 aacplus faac theora twolame wavpack webp x264 x265 xvid armv5te armv6 armv6t2 neon armvfp mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_trasher 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
+IUSE=alsa +encode examples jack oss pic static-libs test v4l +bzip2 cpudetection debug doc gnutls +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio amr amr fdk jpeg2k bluray celt gme gsm modplug opus quvi rtmp ssh schroedinger speex vorbis vpx zvbi bs2b flite frei0r fribidi fontconfig ladspa libass truetype libsoxr +threads aac amrenc mp3 aacplus faac snappy theora twolame wavpack webp x264 x265 xvid armv5te armv6 armv6t2 neon armvfp mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_trasher 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
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( aac? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[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(-)?] ) amr? ( >=media-libs/opencore-amr-0.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(-)?] ) bluray? ( >=media-libs/libbluray-0.3.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(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.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(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-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(-)?] ) celt? ( >=media-libs/celt-0.11.1-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(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[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(-)?] ) aacplus? ( >=media-libs/libaacplus-2.0.2-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(-)?] ) amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-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(-)?] ) faac? ( >=media-libs/faac-1.28-r3[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(-)?] ) mp3? ( >=media-sound/lame-3.99.5-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(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,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(-)?] >=media-libs/libogg-1.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(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-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(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-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(-)?] ) webp? ( >=media-libs/libwebp-0.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(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[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(-)?] ) x265? ( >=media-libs/x265-1.6:=[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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-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(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[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(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[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(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[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(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-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(-)?] ) iconv? ( >=virtual/libiconv-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(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.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(-)?] >=sys-libs/libraw1394-2.1.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(-)?] >=sys-libs/libavc1394-0.5.4-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(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[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(-)?] >=sys-libs/libraw1394-2.1.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(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0: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(-)?] ) libass? ( >=media-libs/libass-0.10.2[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(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.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(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-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(-)?] ) openal? ( >=media-libs/openal-1.15.1[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(-)?] ) opengl? ( >=virtual/opengl-7.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(-)?] ) openssl? ( >=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(-)?] ) opus? ( >=media-libs/opus-1.0.2-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) quvi? ( media-libs/libquvi:0.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(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[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(-)?] ) samba? ( >=net-fs/samba-3.6.23-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(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-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(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,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(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[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(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-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(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[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(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.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(-)?] >=media-libs/libogg-1.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(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] !xcb? ( >=x11-libs/libXfixes-5.0.1[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(-)?] ) >=x11-libs/libXv-1.0.10[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(-)?] ) xcb? ( >=x11-libs/libxcb-1.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(-)?] ) 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(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[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(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
+RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[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(-)?] ) amr? ( >=media-libs/opencore-amr-0.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(-)?] ) bluray? ( >=media-libs/libbluray-0.3.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(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.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(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[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(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-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(-)?] ) celt? ( >=media-libs/celt-0.11.1-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(-)?] ) encode? ( aac? ( >=media-libs/vo-aacenc-0.1.3[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(-)?] ) aacplus? ( >=media-libs/libaacplus-2.0.2-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(-)?] ) amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-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(-)?] ) faac? ( >=media-libs/faac-1.28-r3[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(-)?] ) mp3? ( >=media-sound/lame-3.99.5-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(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-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(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,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(-)?] >=media-libs/libogg-1.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(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-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(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-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(-)?] ) webp? ( >=media-libs/libwebp-0.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(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[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(-)?] ) x265? ( >=media-libs/x265-1.6:=[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(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-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(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[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(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[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(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[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(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[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(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[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(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-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(-)?] ) iconv? ( >=virtual/libiconv-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(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.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(-)?] >=sys-libs/libraw1394-2.1.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(-)?] >=sys-libs/libavc1394-0.5.4-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(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[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(-)?] >=sys-libs/libraw1394-2.1.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(-)?] ) jack? ( >=media-sound/jack-audio-connection-kit-0.121.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(-)?] ) jpeg2k? ( >=media-libs/openjpeg-1.5.0: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(-)?] ) libass? ( >=media-libs/libass-0.10.2[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(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-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(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.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(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-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(-)?] ) modplug? ( >=media-libs/libmodplug-0.8.8.4-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(-)?] ) openal? ( >=media-libs/openal-1.15.1[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(-)?] ) opengl? ( >=virtual/opengl-7.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(-)?] ) openssl? ( >=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(-)?] ) opus? ( >=media-libs/opus-1.0.2-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(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-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(-)?] ) quvi? ( media-libs/libquvi:0.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(-)?] ) rtmp? ( >=media-video/rtmpdump-2.4_p20131018[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(-)?] ) samba? ( >=net-fs/samba-3.6.23-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(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-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(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,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(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-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(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[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(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-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(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[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(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.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(-)?] >=media-libs/libogg-1.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(-)?] ) vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[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(-)?] ) X? ( >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] !xcb? ( >=x11-libs/libXfixes-5.0.1[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(-)?] ) >=x11-libs/libXv-1.0.10[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(-)?] ) xcb? ( >=x11-libs/libxcb-1.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(-)?] ) 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(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[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(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) zvbi? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
 RESTRICT=encode? ( faac? ( bindist ) aacplus? ( bindist ) ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 SLOT=0/54.56.56
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=1900383403e3ff0aa30ab3c449dcf01d
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=137e5f47f75e4a6f04da4db7e56e18c8
diff --git a/metadata/md5-cache/media-video/libav-10.5 b/metadata/md5-cache/media-video/libav-10.5
index fd4a971f7a76..f6513c7eba66 100644
--- a/metadata/md5-cache/media-video/libav-10.5
+++ b/metadata/md5-cache/media-video/libav-10.5
@@ -11,5 +11,5 @@ REQUIRED_USE=rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl
 RESTRICT=test faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )
 SLOT=0/10
 SRC_URI=http://libav.org/releases/libav-10.5.tar.xz test? ( http://dev.gentoo.org/~lu_zero/libav/fate-10.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=974b1aa26938d1533ec7eb22f24058d6
diff --git a/metadata/md5-cache/media-video/libav-10.9999 b/metadata/md5-cache/media-video/libav-10.9999
index f8b07996ed53..993c0b08c045 100644
--- a/metadata/md5-cache/media-video/libav-10.9999
+++ b/metadata/md5-cache/media-video/libav-10.9999
@@ -10,5 +10,5 @@ REQUIRED_USE=rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl
 RESTRICT=test faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )
 SLOT=0/10
 SRC_URI=test? ( http://dev.gentoo.org/~lu_zero/libav/fate-10.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7063c7b2231a04ecaa39a2a4b1afd749
diff --git a/metadata/md5-cache/media-video/libav-11.3 b/metadata/md5-cache/media-video/libav-11.3
index 48982b34af92..89eb490809f5 100644
--- a/metadata/md5-cache/media-video/libav-11.3
+++ b/metadata/md5-cache/media-video/libav-11.3
@@ -11,5 +11,5 @@ REQUIRED_USE=rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl
 RESTRICT=faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )
 SLOT=0/11
 SRC_URI=https://libav.org/releases/libav-11.3.tar.xz http://dev.gentoo.org/~lu_zero/libav/patches/0001-x86-Put-COPY3_IF_LT-under-HAVE_6REGS.patch.gz test? ( http://dev.gentoo.org/~lu_zero/libav/fate-11.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e203f9584c843701b23697b3f998cb76
diff --git a/metadata/md5-cache/media-video/libav-11.9999 b/metadata/md5-cache/media-video/libav-11.9999
index b4ad21dccfc8..a4e5e149e823 100644
--- a/metadata/md5-cache/media-video/libav-11.9999
+++ b/metadata/md5-cache/media-video/libav-11.9999
@@ -10,5 +10,5 @@ REQUIRED_USE=rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl
 RESTRICT=faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )
 SLOT=0/11
 SRC_URI=test? ( http://dev.gentoo.org/~lu_zero/libav/fate-11.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e1bb673362264f9abbada23b523bfeae
diff --git a/metadata/md5-cache/media-video/libav-9.14 b/metadata/md5-cache/media-video/libav-9.14
index 456aa288259c..1f774700343b 100644
--- a/metadata/md5-cache/media-video/libav-9.14
+++ b/metadata/md5-cache/media-video/libav-9.14
@@ -11,5 +11,5 @@ REQUIRED_USE=rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl
 RESTRICT=faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )
 SLOT=0/9
 SRC_URI=http://libav.org/releases/libav-9.14.tar.xz test? ( http://dev.gentoo.org/~lu_zero/libav/fate-9.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6ea56b00f67728d2d522d11f841f4552
diff --git a/metadata/md5-cache/media-video/libav-9.17 b/metadata/md5-cache/media-video/libav-9.17
index 62a1f822ff3d..920fac12288b 100644
--- a/metadata/md5-cache/media-video/libav-9.17
+++ b/metadata/md5-cache/media-video/libav-9.17
@@ -11,5 +11,5 @@ REQUIRED_USE=rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl
 RESTRICT=faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )
 SLOT=0/9
 SRC_URI=http://libav.org/releases/libav-9.17.tar.xz test? ( http://dev.gentoo.org/~lu_zero/libav/fate-9.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=5ab4efd68a2fedda4ffa3f4a5e3c7e3e
diff --git a/metadata/md5-cache/media-video/libav-9999 b/metadata/md5-cache/media-video/libav-9999
index 85576680a636..d4ae33777a56 100644
--- a/metadata/md5-cache/media-video/libav-9999
+++ b/metadata/md5-cache/media-video/libav-9999
@@ -9,5 +9,5 @@ RDEPEND=!media-video/ffmpeg:0 alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(
 REQUIRED_USE=rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) x265? ( gpl ) test? ( encode zlib ) fontconfig? ( truetype )
 RESTRICT=faac? ( bindist ) fdk? ( bindist ) openssl? ( bindist )
 SLOT=0/12
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ec66b148bfb1d15905e09c8bbd6f9f2a
diff --git a/metadata/md5-cache/media-video/mjpegtools-2.1.0-r2 b/metadata/md5-cache/media-video/mjpegtools-2.1.0-r2
index b5fc783591cb..ec30508492d6 100644
--- a/metadata/md5-cache/media-video/mjpegtools-2.1.0-r2
+++ b/metadata/md5-cache/media-video/mjpegtools-2.1.0-r2
@@ -10,5 +10,5 @@ RDEPEND=virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n
 REQUIRED_USE=sdlgfx? ( sdl )
 SLOT=1
 SRC_URI=mirror://sourceforge/mjpeg/mjpegtools-2.1.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=5929778450c19a99af5ccc428a5264a8
diff --git a/metadata/md5-cache/media-video/motion-3.2.12-r3 b/metadata/md5-cache/media-video/motion-3.2.12-r3
index 94d3cce369ec..30d5f2a0a83f 100644
--- a/metadata/md5-cache/media-video/motion-3.2.12-r3
+++ b/metadata/md5-cache/media-video/motion-3.2.12-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A software motion detector
 EAPI=5
 HOMEPAGE=http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome
 IUSE=ffmpeg libav mysql postgres +v4l
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~x86
+KEYWORDS=~alpha amd64 ~arm ~ppc x86
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib virtual/jpeg ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql )
 SLOT=0
 SRC_URI=mirror://sourceforge/motion/motion-3.2.12.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=952996b1566a26a72fc3a2acba67a23e
+_md5_=bd7a2d049cf6c048c9f559e6331c1e45
diff --git a/metadata/md5-cache/media-video/rtmpdump-2.4_p20131018 b/metadata/md5-cache/media-video/rtmpdump-2.4_p20131018
index 1808a5344d1d..13539a1088da 100644
--- a/metadata/md5-cache/media-video/rtmpdump-2.4_p20131018
+++ b/metadata/md5-cache/media-video/rtmpdump-2.4_p20131018
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6[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(-)?] ) polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.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(-)?] ) ) !gnutls? ( !polarssl? ( >=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(-)?] ) ) >=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(-)?] )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~hwoarang/distfiles/rtmpdump-2.4_p20131018.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=9c1ff820aa6381f2dd184f2cd9851b9e
diff --git a/metadata/md5-cache/media-video/rtmpdump-9999 b/metadata/md5-cache/media-video/rtmpdump-9999
index 0fb0ebfa721c..b5abc1195a41 100644
--- a/metadata/md5-cache/media-video/rtmpdump-9999
+++ b/metadata/md5-cache/media-video/rtmpdump-9999
@@ -7,5 +7,5 @@ IUSE=gnutls polarssl ssl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6[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(-)?] ) polarssl? ( !gnutls? ( >=net-libs/polarssl-1.3.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(-)?] ) ) !gnutls? ( !polarssl? ( >=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(-)?] ) ) >=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(-)?] )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7c24acf5a302e6c6228ee3bc7c1ea97c
diff --git a/metadata/md5-cache/media-video/vcdimager-0.7.24 b/metadata/md5-cache/media-video/vcdimager-0.7.24
index d004d9926f99..ab95cd51c4eb 100644
--- a/metadata/md5-cache/media-video/vcdimager-0.7.24
+++ b/metadata/md5-cache/media-video/vcdimager-0.7.24
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libcdio-0.90-r1[-minimal,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(-)?] dev-libs/popt xml? ( dev-libs/libxml2 )
 SLOT=0
 SRC_URI=mirror://gnu/vcdimager/vcdimager-0.7.24.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=671cb07e8edead27bb52f960b8b2d381
diff --git a/metadata/md5-cache/net-analyzer/linkchecker-9.2 b/metadata/md5-cache/net-analyzer/linkchecker-9.2
deleted file mode 100644
index 6560d6d3b146..000000000000
--- a/metadata/md5-cache/net-analyzer/linkchecker-9.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=X? ( dev-qt/qthelp:4 dev-python/markdown2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Check websites for broken links
-EAPI=5
-HOMEPAGE=http://wummel.github.com/linkchecker/ http://pypi.python.org/pypi/linkchecker/
-IUSE=bash-completion clamav geoip gnome login sqlite X python_targets_python2_7
-KEYWORDS=amd64 x86 ~ppc-macos ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=dev-python/dnspython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] bash-completion? ( dev-python/argcomplete[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) clamav? ( app-antivirus/clamav ) geoip? ( dev-python/geoip-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) login? ( dev-python/twill[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) X? ( dev-python/PyQt4[X,help,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[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/L/LinkChecker/LinkChecker-9.2.tar.gz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=a2be853341b8f0c29fc2de124c22d4a3
diff --git a/metadata/md5-cache/net-analyzer/pmacct-1.5.1 b/metadata/md5-cache/net-analyzer/pmacct-1.5.1
index b649d44d5b08..3686d6451ee7 100644
--- a/metadata/md5-cache/net-analyzer/pmacct-1.5.1
+++ b/metadata/md5-cache/net-analyzer/pmacct-1.5.1
@@ -10,4 +10,4 @@ RDEPEND=net-libs/libpcap geoip? ( dev-libs/geoip ) mongodb? ( >=dev-libs/mongo-c
 SLOT=0
 SRC_URI=http://www.pmacct.net/pmacct-1.5.1.tar.gz
 _eclasses_=multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=44671949b55bb34f6020c36ed2aebd1b
+_md5_=64f5706a0dde675241272e664edefb6c
diff --git a/metadata/md5-cache/net-analyzer/sarg-2.3.10 b/metadata/md5-cache/net-analyzer/sarg-2.3.10
index 64e94d90eb0b..3b7aaebb1da6 100644
--- a/metadata/md5-cache/net-analyzer/sarg-2.3.10
+++ b/metadata/md5-cache/net-analyzer/sarg-2.3.10
@@ -4,10 +4,10 @@ DESCRIPTION=Squid Analysis Report Generator
 EAPI=5
 HOMEPAGE=http://sarg.sourceforge.net/
 IUSE=+gd ldap pcre
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=gd? ( media-libs/gd[png,truetype] ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=mirror://sourceforge/sarg/sarg-2.3.10.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=ee9b18795e8681b44f0c8d19c1449b59
+_md5_=ecc6c1760fe4f5ff24d7203c72543231
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.7.4 b/metadata/md5-cache/net-analyzer/tcpdump-4.7.4
index c0abc49471a0..724c198b50fa 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.7.4
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.7.4
@@ -4,10 +4,10 @@ DESCRIPTION=A Tool for network monitoring and data acquisition
 EAPI=5
 HOMEPAGE=http://www.tcpdump.org/
 IUSE=+drop-root smi ssl ipv6 samba suid test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=drop-root? ( sys-libs/libcap-ng ) net-libs/libpcap smi? ( net-libs/libsmi ) ssl? ( >=dev-libs/openssl-0.9.6m )
 SLOT=0
 SRC_URI=http://www.tcpdump.org/release/tcpdump-4.7.4.tar.gz http://www.jp.tcpdump.org/release/tcpdump-4.7.4.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=a2db4d1fc04f57cffec7d35da86a9442
+_md5_=d2b0fdd31a57e66452c465818153fd0d
diff --git a/metadata/md5-cache/net-dns/avahi-0.6.31-r6 b/metadata/md5-cache/net-dns/avahi-0.6.31-r6
index 80bb745525af..196d1e9d7d7e 100644
--- a/metadata/md5-cache/net-dns/avahi-0.6.31-r6
+++ b/metadata/md5-cache/net-dns/avahi-0.6.31-r6
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libdaemon dev-libs/expat >=dev-libs/glib-2.34.3:2[abi_x86_32(-)
 REQUIRED_USE=utils? ( || ( gtk gtk3 ) ) python? ( dbus gdbm ) mono? ( dbus ) howl-compat? ( dbus ) mdnsresponder-compat? ( dbus )
 SLOT=0
 SRC_URI=http://avahi.org/download/avahi-0.6.31.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=7c0ca221bec578f1e172acc2d1ad7c30
diff --git a/metadata/md5-cache/net-dns/avahi-0.6.31-r7 b/metadata/md5-cache/net-dns/avahi-0.6.31-r7
index 7285baf8b20c..2cb36610d845 100644
--- a/metadata/md5-cache/net-dns/avahi-0.6.31-r7
+++ b/metadata/md5-cache/net-dns/avahi-0.6.31-r7
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libdaemon dev-libs/expat >=dev-libs/glib-2.34.3:2[abi_x86_32(-)
 REQUIRED_USE=utils? ( || ( gtk gtk3 ) ) python? ( dbus gdbm ) mono? ( dbus ) howl-compat? ( dbus ) mdnsresponder-compat? ( dbus )
 SLOT=0
 SRC_URI=http://avahi.org/download/avahi-0.6.31.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=94efd79769c0699a03baad1f173dcf0d
diff --git a/metadata/md5-cache/net-dns/c-ares-1.10.0-r1 b/metadata/md5-cache/net-dns/c-ares-1.10.0-r1
index 014b91fd6b35..9225b04af8dc 100644
--- a/metadata/md5-cache/net-dns/c-ares-1.10.0-r1
+++ b/metadata/md5-cache/net-dns/c-ares-1.10.0-r1
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd6
 LICENSE=MIT
 SLOT=0
 SRC_URI=http://c-ares.haxx.se/download/c-ares-1.10.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=cfb454b3e709cd8c5e4aca2a42c2bd64
diff --git a/metadata/md5-cache/net-dns/libidn-1.29 b/metadata/md5-cache/net-dns/libidn-1.29
index 745e492d94e9..bdd7de309113 100644
--- a/metadata/md5-cache/net-dns/libidn-1.29
+++ b/metadata/md5-cache/net-dns/libidn-1.29
@@ -9,5 +9,5 @@ LICENSE=GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
 RDEPEND=emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( >=virtual/libintl-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(-)?] ) java? ( >=virtual/jre-1.5 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://gnu/libidn/libidn-1.29.tar.gz
-_eclasses_=elisp-common	9a16929c1a6aec7e1c903289983e114c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=elisp-common	9a16929c1a6aec7e1c903289983e114c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b2fa48ab5b35af1567899d818c6b6b97
diff --git a/metadata/md5-cache/net-dns/libidn-1.30 b/metadata/md5-cache/net-dns/libidn-1.30
index 55d6889b2242..597ee0ab5884 100644
--- a/metadata/md5-cache/net-dns/libidn-1.30
+++ b/metadata/md5-cache/net-dns/libidn-1.30
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalized Domain Names (IDN) implementation
 EAPI=5
 HOMEPAGE=http://www.gnu.org/software/libidn/
 IUSE=doc emacs java mono nls static-libs elibc_FreeBSD java 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 ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )
 RDEPEND=emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( >=virtual/libintl-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(-)?] ) java? ( >=virtual/jre-1.5 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://gnu/libidn/libidn-1.30.tar.gz
-_eclasses_=elisp-common	9a16929c1a6aec7e1c903289983e114c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e68ee167ffae6726d20da11c08dcc314
+_eclasses_=elisp-common	9a16929c1a6aec7e1c903289983e114c	eutils	9fb270e417e0e83d64ca52586c4a79de	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=e4434c9514f6a3c2c70d8bfd1ec608d7
diff --git a/metadata/md5-cache/net-dns/unbound-1.4.22-r1 b/metadata/md5-cache/net-dns/unbound-1.4.22-r1
index 4f6a62f0a626..f275c933c9f7 100644
--- a/metadata/md5-cache/net-dns/unbound-1.4.22-r1
+++ b/metadata/md5-cache/net-dns/unbound-1.4.22-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://unbound.net/downloads/unbound-1.4.22.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=10089d3547f4921423bdc0485902d2c4
diff --git a/metadata/md5-cache/net-dns/unbound-1.5.1-r2 b/metadata/md5-cache/net-dns/unbound-1.5.1-r2
index c602e86635fa..f9373eb984d0 100644
--- a/metadata/md5-cache/net-dns/unbound-1.5.1-r2
+++ b/metadata/md5-cache/net-dns/unbound-1.5.1-r2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://unbound.net/downloads/unbound-1.5.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=0b8f9e3fa75e11d06e81141de5896b2e
diff --git a/metadata/md5-cache/net-dns/unbound-1.5.2 b/metadata/md5-cache/net-dns/unbound-1.5.2
index a8959cb8d471..69d8d96f9c7c 100644
--- a/metadata/md5-cache/net-dns/unbound-1.5.2
+++ b/metadata/md5-cache/net-dns/unbound-1.5.2
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://unbound.net/downloads/unbound-1.5.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=aebf20bbc779c5d7ce0ac9979666ad94
diff --git a/metadata/md5-cache/net-dns/unbound-1.5.3 b/metadata/md5-cache/net-dns/unbound-1.5.3
index 6a14da2e7983..c12392b1d035 100644
--- a/metadata/md5-cache/net-dns/unbound-1.5.3
+++ b/metadata/md5-cache/net-dns/unbound-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://unbound.net/downloads/unbound-1.5.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=201608e38105a71bba221780999d6760
diff --git a/metadata/md5-cache/net-firewall/firewalld-0.3.13 b/metadata/md5-cache/net-firewall/firewalld-0.3.13
index d383a2d64f4a..17628282fca3 100644
--- a/metadata/md5-cache/net-firewall/firewalld-0.3.13
+++ b/metadata/md5-cache/net-firewall/firewalld-0.3.13
@@ -4,10 +4,10 @@ DESCRIPTION=A firewall daemon with D-BUS interface providing a dynamic firewall
 EAPI=5
 HOMEPAGE=http://fedorahosted.org/firewalld
 IUSE=gui python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 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(-)] 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(-)] dev-python/decorator[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/python-slip-0.2.7[dbus,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/pygobject:3[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(-)] net-firewall/ebtables net-firewall/iptables[ipv6] || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) gui? ( x11-libs/gtk+:3 )
 SLOT=0
 SRC_URI=https://fedorahosted.org/released/firewalld/firewalld-0.3.13.tar.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=a4c3982b310a9e2b4429be253050cf8b
+_md5_=5edc3401af1c8f37e9668105a304207f
diff --git a/metadata/md5-cache/net-fs/libnfs-1.9.7 b/metadata/md5-cache/net-fs/libnfs-1.9.7
index 44772407b44b..03fdacbdd06e 100644
--- a/metadata/md5-cache/net-fs/libnfs-1.9.7
+++ b/metadata/md5-cache/net-fs/libnfs-1.9.7
@@ -4,9 +4,9 @@ DESCRIPTION=Client library for accessing NFS shares over a network
 EAPI=5
 HOMEPAGE=https://github.com/sahlberg/libnfs
 IUSE=examples static-libs
-KEYWORDS=amd64 ~arm hppa ~ppc ppc64 x86
+KEYWORDS=amd64 arm hppa ~ppc ppc64 x86
 LICENSE=LGPL-2.1 GPL-3
 SLOT=0
 SRC_URI=https://github.com/sahlberg/libnfs/archive/libnfs-1.9.7.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=155a1e087f21206e5e47921cbe273c7f
+_md5_=cb08fdf44fca3892a7507f5e79844a5f
diff --git a/metadata/md5-cache/net-fs/openafs-legacy-0.1 b/metadata/md5-cache/net-fs/openafs-legacy-0.1
index 3e6de51be3cd..b7b56aa7041c 100644
--- a/metadata/md5-cache/net-fs/openafs-legacy-0.1
+++ b/metadata/md5-cache/net-fs/openafs-legacy-0.1
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 PDEPEND=net-fs/openafs
 RDEPEND=sys-apps/baselayout
 SLOT=0
-_md5_=7c75fd7788bd884a664595f65434cfa8
+_md5_=df66ff7b3cb9b7f6b5345b0bb92bef75
diff --git a/metadata/md5-cache/net-fs/samba-3.6.25 b/metadata/md5-cache/net-fs/samba-3.6.25
index 916181ff5826..b7618d738010 100644
--- a/metadata/md5-cache/net-fs/samba-3.6.25
+++ b/metadata/md5-cache/net-fs/samba-3.6.25
@@ -11,5 +11,5 @@ REQUIRED_USE=ads? ( ldap ) swat? ( server )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-3.6.25.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b1b6ab9ab1ca207c702de737bf0f9eb4
diff --git a/metadata/md5-cache/net-fs/samba-4.0.26 b/metadata/md5-cache/net-fs/samba-4.0.26
index 1a8541934b94..572b60b4c703 100644
--- a/metadata/md5-cache/net-fs/samba-4.0.26
+++ b/metadata/md5-cache/net-fs/samba-4.0.26
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.0.26.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
-_md5_=3b5485001b11ec3ff323ac996ca8556f
+_md5_=b334f42b52ba113bd208d2feef5c1f32
diff --git a/metadata/md5-cache/net-fs/samba-4.1.18 b/metadata/md5-cache/net-fs/samba-4.1.18
index f0b1c54f46a9..edf0f6a7d75a 100644
--- a/metadata/md5-cache/net-fs/samba-4.1.18
+++ b/metadata/md5-cache/net-fs/samba-4.1.18
@@ -1,15 +1,15 @@
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=>=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(+)] >=app-crypt/heimdal-1.5[-ssl] dev-libs/iniparser dev-libs/popt sys-libs/readline:= virtual/libiconv dev-python/subunit[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(+)] sys-apps/attr sys-libs/libcap >=sys-libs/ntdb-1.0[python,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(+)] >=sys-libs/ldb-1.1.17 >=sys-libs/tdb-1.2.12[python,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(+)] >=sys-libs/talloc-2.1.2[python,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(+)] >=sys-libs/tevent-0.9.18 sys-libs/zlib virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) aio? ( dev-libs/libaio ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd:0= ) virtual/pkgconfig dev-lang/python !dev-lang/python[-threads] virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=>=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(+)] >=app-crypt/heimdal-1.5[-ssl,-threads] dev-libs/iniparser dev-libs/popt sys-libs/readline:= virtual/libiconv dev-python/subunit[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(+)] sys-apps/attr sys-libs/libcap >=sys-libs/ntdb-1.0[python,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(+)] >=sys-libs/ldb-1.1.17 >=sys-libs/tdb-1.2.12[python,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(+)] >=sys-libs/talloc-2.1.2[python,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(+)] >=sys-libs/tevent-0.9.18 sys-libs/zlib virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) aio? ( dev-libs/libaio ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd:0= ) virtual/pkgconfig dev-lang/python !dev-lang/python[-threads] virtual/pkgconfig
 DESCRIPTION=Samba Suite Version 4
 EAPI=5
 HOMEPAGE=http://www.samba.org/
 IUSE=acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint ldap quota selinux syslog systemd test winbind python_targets_python2_7
 KEYWORDS=~amd64 ~arm64 ~hppa ~x86
 LICENSE=GPL-3
-RDEPEND=>=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(+)] >=app-crypt/heimdal-1.5[-ssl] dev-libs/iniparser dev-libs/popt sys-libs/readline:= virtual/libiconv dev-python/subunit[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(+)] sys-apps/attr sys-libs/libcap >=sys-libs/ntdb-1.0[python,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(+)] >=sys-libs/ldb-1.1.17 >=sys-libs/tdb-1.2.12[python,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(+)] >=sys-libs/talloc-2.1.2[python,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(+)] >=sys-libs/tevent-0.9.18 sys-libs/zlib virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) aio? ( dev-libs/libaio ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd:0= ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba )
+RDEPEND=>=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(+)] >=app-crypt/heimdal-1.5[-ssl,-threads] dev-libs/iniparser dev-libs/popt sys-libs/readline:= virtual/libiconv dev-python/subunit[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(+)] sys-apps/attr sys-libs/libcap >=sys-libs/ntdb-1.0[python,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(+)] >=sys-libs/ldb-1.1.17 >=sys-libs/tdb-1.2.12[python,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(+)] >=sys-libs/talloc-2.1.2[python,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(+)] >=sys-libs/tevent-0.9.18 sys-libs/zlib virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) aio? ( dev-libs/libaio ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd:0= ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba )
 REQUIRED_USE=ads? ( acl ldap ) python_targets_python2_7
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.1.18.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
-_md5_=a7cfd25e1495464a54fbafaca586635c
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
+_md5_=6a7086c0ea7c42b65190dac73295e53d
diff --git a/metadata/md5-cache/net-fs/samba-4.1.19 b/metadata/md5-cache/net-fs/samba-4.1.19
index 04e4c70c4525..13c99245465b 100644
--- a/metadata/md5-cache/net-fs/samba-4.1.19
+++ b/metadata/md5-cache/net-fs/samba-4.1.19
@@ -1,15 +1,15 @@
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=>=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(+)] >=app-crypt/heimdal-1.5[-ssl] dev-libs/iniparser dev-libs/popt sys-libs/readline:= virtual/libiconv dev-python/subunit[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(+)] sys-apps/attr sys-libs/libcap >=sys-libs/ntdb-1.0[python,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(+)] >=sys-libs/ldb-1.1.17 >=sys-libs/tdb-1.2.12[python,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(+)] >=sys-libs/talloc-2.1.2[python,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(+)] >=sys-libs/tevent-0.9.18 sys-libs/zlib virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) aio? ( dev-libs/libaio ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd:0= ) virtual/pkgconfig dev-lang/python !dev-lang/python[-threads] virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=>=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(+)] >=app-crypt/heimdal-1.5[-ssl,-threads] dev-libs/iniparser dev-libs/popt sys-libs/readline:= virtual/libiconv dev-python/subunit[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(+)] sys-apps/attr sys-libs/libcap >=sys-libs/ntdb-1.0[python,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(+)] >=sys-libs/ldb-1.1.17 >=sys-libs/tdb-1.2.12[python,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(+)] >=sys-libs/talloc-2.1.2[python,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(+)] >=sys-libs/tevent-0.9.18 sys-libs/zlib virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) aio? ( dev-libs/libaio ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd:0= ) virtual/pkgconfig dev-lang/python !dev-lang/python[-threads] virtual/pkgconfig
 DESCRIPTION=Samba Suite Version 4
 EAPI=5
 HOMEPAGE=http://www.samba.org/
 IUSE=acl addns ads aio avahi client cluster cups dmapi fam gnutls iprint ldap quota selinux syslog systemd test winbind python_targets_python2_7
 KEYWORDS=~amd64 ~arm64 ~hppa ~x86
 LICENSE=GPL-3
-RDEPEND=>=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(+)] >=app-crypt/heimdal-1.5[-ssl] dev-libs/iniparser dev-libs/popt sys-libs/readline:= virtual/libiconv dev-python/subunit[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(+)] sys-apps/attr sys-libs/libcap >=sys-libs/ntdb-1.0[python,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(+)] >=sys-libs/ldb-1.1.17 >=sys-libs/tdb-1.2.12[python,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(+)] >=sys-libs/talloc-2.1.2[python,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(+)] >=sys-libs/tevent-0.9.18 sys-libs/zlib virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) aio? ( dev-libs/libaio ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd:0= ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba )
+RDEPEND=>=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(+)] >=app-crypt/heimdal-1.5[-ssl,-threads] dev-libs/iniparser dev-libs/popt sys-libs/readline:= virtual/libiconv dev-python/subunit[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(+)] sys-apps/attr sys-libs/libcap >=sys-libs/ntdb-1.0[python,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(+)] >=sys-libs/ldb-1.1.17 >=sys-libs/tdb-1.2.12[python,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(+)] >=sys-libs/talloc-2.1.2[python,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(+)] >=sys-libs/tevent-0.9.18 sys-libs/zlib virtual/pam acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) aio? ( dev-libs/libaio ) cluster? ( >=dev-db/ctdb-1.0.114_p1 ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) ldap? ( net-nds/openldap ) systemd? ( sys-apps/systemd:0= ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba )
 REQUIRED_USE=ads? ( acl ldap ) python_targets_python2_7
 RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.1.19.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
-_md5_=af59a67fbfb1a5b8001ff3d88b435d8e
+_eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
+_md5_=091e903366468ed9d28d4a0730932357
diff --git a/metadata/md5-cache/net-fs/samba-4.2.0 b/metadata/md5-cache/net-fs/samba-4.2.0
index 821726178f2a..e4a4b049053b 100644
--- a/metadata/md5-cache/net-fs/samba-4.2.0
+++ b/metadata/md5-cache/net-fs/samba-4.2.0
@@ -12,4 +12,4 @@ RESTRICT=mirror
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.2.0.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
-_md5_=09169675fffc2e625e13af3a202cf88b
+_md5_=3450f4c5fa583436060c3660bddbcd2b
diff --git a/metadata/md5-cache/net-im/corebird-1.0 b/metadata/md5-cache/net-im/corebird-1.0
new file mode 100644
index 000000000000..0c85c5a469cd
--- /dev/null
+++ b/metadata/md5-cache/net-im/corebird-1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.40:2 dev-libs/json-glib dev-libs/libgee:0.8 gstreamer? ( media-plugins/gst-plugins-meta:1.0[X,ffmpeg] ) >=net-libs/libsoup-2.42.3.1 >=net-libs/rest-0.7.91:0.7 >=x11-libs/gtk+-3.14:3 || ( dev-lang/vala:0.28 dev-lang/vala:0.26 dev-lang/vala:0.24 ) >=dev-util/intltool-0.40 sys-apps/sed virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=Native GTK+3 Twitter client
+EAPI=5
+HOMEPAGE=http://corebird.baedert.org/
+IUSE=debug gstreamer debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-db/sqlite:3 >=dev-libs/glib-2.40:2 dev-libs/json-glib dev-libs/libgee:0.8 gstreamer? ( media-plugins/gst-plugins-meta:1.0[X,ffmpeg] ) >=net-libs/libsoup-2.42.3.1 >=net-libs/rest-0.7.91:0.7 >=x11-libs/gtk+-3.14:3
+SLOT=0
+SRC_URI=https://github.com/baedert/corebird/archive/1.0.tar.gz -> corebird-1.0.tar.gz
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=bd89f184c3e7b56f3b12606327d20be1
diff --git a/metadata/md5-cache/net-im/pidgin-2.10.11 b/metadata/md5-cache/net-im/pidgin-2.10.11
index 85e72d2bb8f6..6cb023ce2097 100644
--- a/metadata/md5-cache/net-im/pidgin-2.10.11
+++ b/metadata/md5-cache/net-im/pidgin-2.10.11
@@ -4,11 +4,11 @@ DESCRIPTION=GTK Instant Messenger client
 EAPI=5
 HOMEPAGE=http://pidgin.im/
 IUSE=dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit networkmanager nls perl silc tcl tk spell sasl ncurses groupwise prediction python +xscreensaver zephyr zeroconf aqua debug 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=~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( sys-libs/ncurses[unicode] dbus? ( 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(+)?] ) 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(+)?] ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( =media-libs/gstreamer-0.10* =media-libs/gst-plugins-good-0.10* net-libs/farstream:0.1 media-plugins/gst-plugins-meta:0.10 media-plugins/gst-plugins-gconf:0.10 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 dev-python/dbus-python ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls] >=net-libs/libgadu-1.11.0[-ssl] ) ) gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/nss-3.15.4 ) meanwhile? ( net-libs/meanwhile ) silc? ( >=net-im/silc-toolkit-1.0.1 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn ) !<x11-plugins/pidgin-facebookchat-1.69-r1
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) 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 ) ) dbus? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) 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=mirror://sourceforge/pidgin/pidgin-2.10.11.tar.bz2 http://dev.gentoo.org/~polynomial-c/pidgin-eds-3.6.patch.bz2
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-app	8886390eb1ac390b27350184fd3eb32f	perl-module	9ff260c452d420630500e700913be8d8	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6e249403d245aac11d4710869ec0c8d2
+_md5_=abfdb42a485c064dec3031991124502e
diff --git a/metadata/md5-cache/net-irc/konversation-1.6 b/metadata/md5-cache/net-irc/konversation-1.6
index 79ac1f436bc7..5e53a58d67e0 100644
--- a/metadata/md5-cache/net-irc/konversation-1.6
+++ b/metadata/md5-cache/net-irc/konversation-1.6
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.10.0:5 >=kde-frameworks/kbookmarks-5.10.0:5 >=kde-frameworks/kcodecs-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kemoticons-5.10.0:5 >=kde-frameworks/kglobalaccel-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kidletime-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kitemviews-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/knotifyconfig-5.10.0:5 >=kde-frameworks/kparts-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/ktextwidgets-5.10.0:5 >=kde-frameworks/kwallet-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/solid-5.10.0:5 >=kde-frameworks/sonnet-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/phonon[qt5] crypt? ( app-crypt/qca:2[qt5] ) sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 handbook? ( >=kde-frameworks/kdoctools-5.10.0:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.11.0:5 >=kde-frameworks/kbookmarks-5.11.0:5 >=kde-frameworks/kcodecs-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kemoticons-5.11.0:5 >=kde-frameworks/kglobalaccel-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kidletime-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kitemviews-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/knotifyconfig-5.11.0:5 >=kde-frameworks/kparts-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/ktextwidgets-5.11.0:5 >=kde-frameworks/kwallet-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/solid-5.11.0:5 >=kde-frameworks/sonnet-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/phonon[qt5] crypt? ( app-crypt/qca:2[qt5] ) sys-devel/gettext >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 handbook? ( >=kde-frameworks/kdoctools-5.11.0:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=A user friendly IRC Client
 EAPI=5
 HOMEPAGE=http://kde.org/applications/internet/konversation/ http://konversation.kde.org
 IUSE=+crypt debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.10.0:5 >=kde-frameworks/kbookmarks-5.10.0:5 >=kde-frameworks/kcodecs-5.10.0:5 >=kde-frameworks/kcompletion-5.10.0:5 >=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kdbusaddons-5.10.0:5 >=kde-frameworks/kemoticons-5.10.0:5 >=kde-frameworks/kglobalaccel-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kidletime-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kitemviews-5.10.0:5 >=kde-frameworks/knotifications-5.10.0:5 >=kde-frameworks/knotifyconfig-5.10.0:5 >=kde-frameworks/kparts-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/ktextwidgets-5.10.0:5 >=kde-frameworks/kwallet-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 >=kde-frameworks/solid-5.10.0:5 >=kde-frameworks/sonnet-5.10.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/phonon[qt5] crypt? ( app-crypt/qca:2[qt5] ) sys-devel/gettext !net-irc/konversation:4 crypt? ( app-crypt/qca:2[openssl] ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/karchive-5.11.0:5 >=kde-frameworks/kbookmarks-5.11.0:5 >=kde-frameworks/kcodecs-5.11.0:5 >=kde-frameworks/kcompletion-5.11.0:5 >=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kdbusaddons-5.11.0:5 >=kde-frameworks/kemoticons-5.11.0:5 >=kde-frameworks/kglobalaccel-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kidletime-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kitemviews-5.11.0:5 >=kde-frameworks/knotifications-5.11.0:5 >=kde-frameworks/knotifyconfig-5.11.0:5 >=kde-frameworks/kparts-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/ktextwidgets-5.11.0:5 >=kde-frameworks/kwallet-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 >=kde-frameworks/solid-5.11.0:5 >=kde-frameworks/sonnet-5.11.0:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/phonon[qt5] crypt? ( app-crypt/qca:2[qt5] ) sys-devel/gettext !net-irc/konversation:4 crypt? ( app-crypt/qca:2[openssl] ) >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/konversation/1.6/src/konversation-1.6.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=cff1e3b1c6b4cfdcd5c43e808edcfcdf
diff --git a/metadata/md5-cache/net-libs/axtls-1.5.0 b/metadata/md5-cache/net-libs/axtls-1.5.0
index 3d41a08b7d02..59c3d32e6056 100644
--- a/metadata/md5-cache/net-libs/axtls-1.5.0
+++ b/metadata/md5-cache/net-libs/axtls-1.5.0
@@ -10,5 +10,5 @@ RDEPEND=httpd? ( cgi-lua? ( dev-lang/lua ) cgi-php? ( dev-lang/php[cgi] ) )
 REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ) cgi-php? ( httpd )
 SLOT=0
 SRC_URI=mirror://sourceforge/axtls/axTLS-1.5.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=6c9a430352a86b012e272f97bcf90165
diff --git a/metadata/md5-cache/net-libs/axtls-1.5.1 b/metadata/md5-cache/net-libs/axtls-1.5.1
index 1118ec2e842f..3aac49005ae1 100644
--- a/metadata/md5-cache/net-libs/axtls-1.5.1
+++ b/metadata/md5-cache/net-libs/axtls-1.5.1
@@ -10,5 +10,5 @@ RDEPEND=httpd? ( cgi-lua? ( dev-lang/lua ) cgi-php? ( dev-lang/php[cgi] ) )
 REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ) cgi-php? ( httpd )
 SLOT=0
 SRC_URI=mirror://sourceforge/axtls/axTLS-1.5.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=7535a14aef3533e68a517adf966a2f61
diff --git a/metadata/md5-cache/net-libs/axtls-1.5.2 b/metadata/md5-cache/net-libs/axtls-1.5.2
index 90150f6c0eab..d4d520887c6e 100644
--- a/metadata/md5-cache/net-libs/axtls-1.5.2
+++ b/metadata/md5-cache/net-libs/axtls-1.5.2
@@ -10,5 +10,5 @@ RDEPEND=httpd? ( cgi-lua? ( dev-lang/lua ) cgi-php? ( dev-lang/php[cgi] ) )
 REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ) cgi-php? ( httpd )
 SLOT=0
 SRC_URI=mirror://sourceforge/axtls/axTLS-1.5.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=3478e49d4343649d01842146639a2d67
diff --git a/metadata/md5-cache/net-libs/axtls-1.5.3 b/metadata/md5-cache/net-libs/axtls-1.5.3
index ae1af59a2770..ea7d45774484 100644
--- a/metadata/md5-cache/net-libs/axtls-1.5.3
+++ b/metadata/md5-cache/net-libs/axtls-1.5.3
@@ -10,5 +10,5 @@ RDEPEND=httpd? ( cgi-lua? ( dev-lang/lua ) cgi-php? ( dev-lang/php[cgi] ) )
 REQUIRED_USE=static? ( httpd ) cgi-lua? ( httpd ) cgi-php? ( httpd )
 SLOT=0
 SRC_URI=mirror://sourceforge/axtls/axTLS-1.5.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	savedconfig	5313100f525c41f6c72c6e04edeb4f65	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=d24907e90cd78a30c600894d1d01b2cb
diff --git a/metadata/md5-cache/net-libs/ftplib-4.0-r1 b/metadata/md5-cache/net-libs/ftplib-4.0-r1
index 5fcec4524977..a40d2788e137 100644
--- a/metadata/md5-cache/net-libs/ftplib-4.0-r1
+++ b/metadata/md5-cache/net-libs/ftplib-4.0-r1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=Artistic-2
 SLOT=0
 SRC_URI=http://nbpfaus.net/~pfau/ftplib/ftplib-4.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7f7431292057ed91d5e84a985299fd3a
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.40.1-r1 b/metadata/md5-cache/net-libs/glib-networking-2.40.1-r1
index f812a2a4077b..31dbf825b9d6 100644
--- a/metadata/md5-cache/net-libs/glib-networking-2.40.1-r1
+++ b/metadata/md5-cache/net-libs/glib-networking-2.40.1-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40.0-r1:2[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(-)?] gnome? ( gnome-base/gsettings-desktop-schemas ) libproxy? ( >=net-libs/libproxy-0.4.11-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(-)?] ) smartcard? ( >=app-crypt/p11-kit-0.18.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(-)?] >=net-libs/gnutls-2.12.23-r6:=[pkcs11,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(-)?] ) ssl? ( app-misc/ca-certificates >=net-libs/gnutls-2.12.23-r6:=[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
 SRC_URI=mirror://gnome/sources/glib-networking/2.40/glib-networking-2.40.1.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=48086191505e593987608f9d4b6a4bd9
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.42.1 b/metadata/md5-cache/net-libs/glib-networking-2.42.1
index 47771dd98c46..3d64f9351939 100644
--- a/metadata/md5-cache/net-libs/glib-networking-2.42.1
+++ b/metadata/md5-cache/net-libs/glib-networking-2.42.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.42:2[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(-)?] gnome? ( gnome-base/gsettings-desktop-schemas ) libproxy? ( >=net-libs/libproxy-0.4.11-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(-)?] ) smartcard? ( >=app-crypt/p11-kit-0.18.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(-)?] >=net-libs/gnutls-3:=[pkcs11,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(-)?] ) ssl? ( app-misc/ca-certificates >=net-libs/gnutls-3:=[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
 SRC_URI=mirror://gnome/sources/glib-networking/2.42/glib-networking-2.42.1.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=b4932cde4ee37217c47e0ee74fa5db69
diff --git a/metadata/md5-cache/net-libs/glib-networking-2.44.0 b/metadata/md5-cache/net-libs/glib-networking-2.44.0
index acc14af87c09..3dc175c17b6e 100644
--- a/metadata/md5-cache/net-libs/glib-networking-2.44.0
+++ b/metadata/md5-cache/net-libs/glib-networking-2.44.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.39.1:2[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(-)?] gnome? ( gnome-base/gsettings-desktop-schemas ) libproxy? ( >=net-libs/libproxy-0.4.11-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(-)?] ) smartcard? ( >=app-crypt/p11-kit-0.18.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(-)?] >=net-libs/gnutls-3:=[pkcs11,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(-)?] ) ssl? ( app-misc/ca-certificates >=net-libs/gnutls-3:=[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
 SRC_URI=mirror://gnome/sources/glib-networking/2.44/glib-networking-2.44.0.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=3bdf4b513ba06e557b29bf18bdb49c7f
diff --git a/metadata/md5-cache/net-libs/gnutls-3.3.15 b/metadata/md5-cache/net-libs/gnutls-3.3.15
index d88ff132b78c..dec1ea445f2c 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.3.15
+++ b/metadata/md5-cache/net-libs/gnutls-3.3.15
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/libtasn1-3.9[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(-)?] >=dev-libs/nettle-2.7[gmp,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(-)?] <dev-libs/nettle-3[gmp,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(-)?] >=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(-)?] sys-devel/autogen crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[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(-)?] ) guile? ( >=dev-scheme/guile-1.8:*[networking] ) nls? ( >=virtual/libintl-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(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.20.7[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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnupg/gnutls/v3.3/gnutls-3.3.15.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d88f4885da0f6e7d0b10a6b0c276e145
diff --git a/metadata/md5-cache/net-libs/gnutls-3.3.15-r1 b/metadata/md5-cache/net-libs/gnutls-3.3.15-r1
index 087b71ea2143..cd4c7d3abd73 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.3.15-r1
+++ b/metadata/md5-cache/net-libs/gnutls-3.3.15-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/libtasn1-3.9[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(-)?] >=dev-libs/nettle-2.7[gmp,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(-)?] <dev-libs/nettle-3[gmp,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(-)?] >=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(-)?] sys-devel/autogen crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[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(-)?] ) guile? ( >=dev-scheme/guile-1.8:*[networking] ) nls? ( >=virtual/libintl-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(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.20.7[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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnupg/gnutls/v3.3/gnutls-3.3.15.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ccbe4d01edf1b0bc652ff6d165947a7f
diff --git a/metadata/md5-cache/net-libs/gnutls-3.4.1 b/metadata/md5-cache/net-libs/gnutls-3.4.1
index 6e62d6e51ace..24cea2cf60be 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.4.1
+++ b/metadata/md5-cache/net-libs/gnutls-3.4.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/libtasn1-3.9[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(-)?] >=dev-libs/nettle-3.1[gmp,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(-)?] >=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(-)?] tools? ( sys-devel/autogen ) crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[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(-)?] ) guile? ( >=dev-scheme/guile-1.8:*[networking] ) nls? ( >=virtual/libintl-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(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1[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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/30
 SRC_URI=mirror://gnupg/gnutls/v3.4/gnutls-3.4.1.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0b7cb0d7621f9146e64fcd30535b512a
diff --git a/metadata/md5-cache/net-libs/gnutls-3.4.2-r1 b/metadata/md5-cache/net-libs/gnutls-3.4.2-r1
index 54cca5e0fc14..bfac1c33b8ed 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.4.2-r1
+++ b/metadata/md5-cache/net-libs/gnutls-3.4.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/libtasn1-3.9[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(-)?] >=dev-libs/nettle-3.1[gmp,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(-)?] >=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(-)?] tools? ( sys-devel/autogen ) crywrap? ( net-dns/libidn ) dane? ( >=net-dns/unbound-1.4.20[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(-)?] ) guile? ( >=dev-scheme/guile-1.8:*[networking] ) nls? ( >=virtual/libintl-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(-)?] ) pkcs11? ( >=app-crypt/p11-kit-0.23.1[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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0/30
 SRC_URI=mirror://gnupg/gnutls/v3.4/gnutls-3.4.2.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ab8d0c82ec8b162ebe69454ed5aa21ab
diff --git a/metadata/md5-cache/net-libs/gssdp-0.14.10 b/metadata/md5-cache/net-libs/gssdp-0.14.10
index 655148e0be66..53e98d1bc5b6 100644
--- a/metadata/md5-cache/net-libs/gssdp-0.14.10
+++ b/metadata/md5-cache/net-libs/gssdp-0.14.10
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] >=net-libs/libsoup-2.44.2:2.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(-)?,introspection?] gtk? ( >=x11-libs/gtk+-3.0:3 ) introspection? ( || ( dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) >=dev-libs/gobject-introspection-0.6.7 ) !<net-libs/gupnp-vala-0.10.3
 SLOT=0/3
 SRC_URI=mirror://gnome/sources/gssdp/0.14/gssdp-0.14.10.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d8ad738913074b57921e992dd98a5dcb
diff --git a/metadata/md5-cache/net-libs/gssdp-0.14.11 b/metadata/md5-cache/net-libs/gssdp-0.14.11
index e6b9c3d2d0d4..b0b2061ea4a2 100644
--- a/metadata/md5-cache/net-libs/gssdp-0.14.11
+++ b/metadata/md5-cache/net-libs/gssdp-0.14.11
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] >=net-libs/libsoup-2.44.2:2.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(-)?,introspection?] gtk? ( >=x11-libs/gtk+-3.0:3 ) introspection? ( || ( dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] dev-lang/vala:0.24[vapigen(+)] dev-lang/vala:0.22[vapigen(+)] dev-lang/vala:0.20[vapigen(+)] ) >=dev-libs/gobject-introspection-0.6.7 ) !<net-libs/gupnp-vala-0.10.3
 SLOT=0/3
 SRC_URI=mirror://gnome/sources/gssdp/0.14/gssdp-0.14.11.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1e6774371a4edfceea35245532d25d23
diff --git a/metadata/md5-cache/net-libs/gupnp-0.20.13 b/metadata/md5-cache/net-libs/gupnp-0.20.13
index ea95caef8608..126d2f2d0b40 100644
--- a/metadata/md5-cache/net-libs/gupnp-0.20.13
+++ b/metadata/md5-cache/net-libs/gupnp-0.20.13
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-
 REQUIRED_USE=|| ( python_targets_python2_7 ) ?? ( connman networkmanager )
 SLOT=0/4
 SRC_URI=mirror://gnome/sources/gupnp/0.20/gupnp-0.20.13.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a308afaa86473892d04000d8a0e1590b
diff --git a/metadata/md5-cache/net-libs/gupnp-0.20.14 b/metadata/md5-cache/net-libs/gupnp-0.20.14
index 2bd57ca59166..1f445b37a38d 100644
--- a/metadata/md5-cache/net-libs/gupnp-0.20.14
+++ b/metadata/md5-cache/net-libs/gupnp-0.20.14
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-
 REQUIRED_USE=|| ( python_targets_python2_7 ) ?? ( connman networkmanager )
 SLOT=0/4
 SRC_URI=mirror://gnome/sources/gupnp/0.20/gupnp-0.20.14.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ba7e4819f76437f68db714cbc5e24a37
diff --git a/metadata/md5-cache/net-libs/gupnp-igd-0.2.3-r1 b/metadata/md5-cache/net-libs/gupnp-igd-0.2.3-r1
index 79c72d7c8fe4..98f4c8d855bd 100644
--- a/metadata/md5-cache/net-libs/gupnp-igd-0.2.3-r1
+++ b/metadata/md5-cache/net-libs/gupnp-igd-0.2.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gupnp-igd/0.2/gupnp-igd-0.2.3.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9e26f9cf684164c9e74983ff3b8aed85
diff --git a/metadata/md5-cache/net-libs/gupnp-igd-0.2.4 b/metadata/md5-cache/net-libs/gupnp-igd-0.2.4
index 13b7cbe50e0f..fa5c8860a1ec 100644
--- a/metadata/md5-cache/net-libs/gupnp-igd-0.2.4
+++ b/metadata/md5-cache/net-libs/gupnp-igd-0.2.4
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gnome/sources/gupnp-igd/0.2/gupnp-igd-0.2.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1aac51ae580d069c19be7f3261ede733
diff --git a/metadata/md5-cache/net-libs/http-parser-2.3 b/metadata/md5-cache/net-libs/http-parser-2.3
index 85e6d5be298d..dc9bbad2fe57 100644
--- a/metadata/md5-cache/net-libs/http-parser-2.3
+++ b/metadata/md5-cache/net-libs/http-parser-2.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm ppc x86
 LICENSE=MIT
 SLOT=0/2.3
 SRC_URI=https://github.com/joyent/http-parser/archive/v2.3.tar.gz -> http-parser-2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8d3b4e4e9c27b62045169a55f288e38b
diff --git a/metadata/md5-cache/net-libs/http-parser-2.4.1 b/metadata/md5-cache/net-libs/http-parser-2.4.1
index 4153fd0c7d02..6feee6677987 100644
--- a/metadata/md5-cache/net-libs/http-parser-2.4.1
+++ b/metadata/md5-cache/net-libs/http-parser-2.4.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=MIT
 SLOT=0/2.4.1
 SRC_URI=https://github.com/joyent/http-parser/archive/v2.4.1.tar.gz -> http-parser-2.4.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e40c133add11e042b08a7b9b2c5ad28a
diff --git a/metadata/md5-cache/net-libs/http-parser-2.4.2 b/metadata/md5-cache/net-libs/http-parser-2.4.2
index 3c562d0aab8f..9e18fb01b022 100644
--- a/metadata/md5-cache/net-libs/http-parser-2.4.2
+++ b/metadata/md5-cache/net-libs/http-parser-2.4.2
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=MIT
 SLOT=0/2.4.2
 SRC_URI=https://github.com/joyent/http-parser/archive/v2.4.2.tar.gz -> http-parser-2.4.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=89a5fa69d1d2d84c35fe9cd875836e5a
diff --git a/metadata/md5-cache/net-libs/http-parser-2.5.0 b/metadata/md5-cache/net-libs/http-parser-2.5.0
index f8610c23e101..8f4d4cebe4a4 100644
--- a/metadata/md5-cache/net-libs/http-parser-2.5.0
+++ b/metadata/md5-cache/net-libs/http-parser-2.5.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=MIT
 SLOT=0/2.5.0
 SRC_URI=https://github.com/joyent/http-parser/archive/v2.5.0.tar.gz -> http-parser-2.5.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=606e154a1b1ac07c72220d66e8b0c6ee
diff --git a/metadata/md5-cache/net-libs/hubbub-0.1.2-r1 b/metadata/md5-cache/net-libs/hubbub-0.1.2-r1
index 2ea17bea844a..5e76c6cbbb5c 100644
--- a/metadata/md5-cache/net-libs/hubbub-0.1.2-r1
+++ b/metadata/md5-cache/net-libs/hubbub-0.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=<dev-libs/libparserutils-0.2 !net-libs/libhubbub
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/hubbub-0.1.2-src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=5f60fc03b53b21e84b9fc2f71bf4ab5a
diff --git a/metadata/md5-cache/net-libs/ldns-1.6.17 b/metadata/md5-cache/net-libs/ldns-1.6.17
index 9054519627e1..34410f3858a7 100644
--- a/metadata/md5-cache/net-libs/ldns-1.6.17
+++ b/metadata/md5-cache/net-libs/ldns-1.6.17
@@ -11,5 +11,5 @@ REQUIRED_USE=ecdsa? ( ssl ) python? ( python_targets_python2_7 )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.17.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ddfb086bd3118440dcd551ede32de8ae
diff --git a/metadata/md5-cache/net-libs/libasyncns-0.8-r3 b/metadata/md5-cache/net-libs/libasyncns-0.8-r3
index 1e9450499ea6..bd9caa1792da 100644
--- a/metadata/md5-cache/net-libs/libasyncns-0.8-r3
+++ b/metadata/md5-cache/net-libs/libasyncns-0.8-r3
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-lin
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/libasyncns/libasyncns-0.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=65349c2d080a6400b11f0e11d84d4e6b
diff --git a/metadata/md5-cache/net-libs/libcapi-3.0.7-r1 b/metadata/md5-cache/net-libs/libcapi-3.0.7-r1
index fef30fd16165..b33874257bd8 100644
--- a/metadata/md5-cache/net-libs/libcapi-3.0.7-r1
+++ b/metadata/md5-cache/net-libs/libcapi-3.0.7-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=!net-dialup/capi4k-utils
 SLOT=0
 SRC_URI=http://www.tabos.org/ffgtk/download/libcapi20-3.0.7.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=de808a06d1ced29d8afc5af5b7081c8b
diff --git a/metadata/md5-cache/net-libs/libdom-0.1.1 b/metadata/md5-cache/net-libs/libdom-0.1.1
index 5269a65baad6..6a12f3f53496 100644
--- a/metadata/md5-cache/net-libs/libdom-0.1.1
+++ b/metadata/md5-cache/net-libs/libdom-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libparserutils-0.2.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_6
 REQUIRED_USE=test? ( xml )
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libdom-0.1.1-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.2.tar.gz -> netsurf-buildsystem-1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4cc59cf9cca508ddd54d1ceccf2b3402
diff --git a/metadata/md5-cache/net-libs/libdom-0.1.2-r1 b/metadata/md5-cache/net-libs/libdom-0.1.2-r1
index acfa41e6aabc..31567b6016e6 100644
--- a/metadata/md5-cache/net-libs/libdom-0.1.2-r1
+++ b/metadata/md5-cache/net-libs/libdom-0.1.2-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libparserutils-0.2.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_6
 REQUIRED_USE=test? ( xml )
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libdom-0.1.2-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.3.tar.gz -> netsurf-buildsystem-1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=35c5f36e898e2a563762c90dd4776795
diff --git a/metadata/md5-cache/net-libs/libgadu-1.12.1 b/metadata/md5-cache/net-libs/libgadu-1.12.1
index 55f6cf32618b..9a714261784e 100644
--- a/metadata/md5-cache/net-libs/libgadu-1.12.1
+++ b/metadata/md5-cache/net-libs/libgadu-1.12.1
@@ -4,11 +4,11 @@ DESCRIPTION=This library implements the client side of the Gadu-Gadu protocol
 EAPI=5
 HOMEPAGE=http://toxygen.net/libgadu/
 IUSE=doc gnutls ssl static-libs test threads
-KEYWORDS=amd64 ~arm ~mips ppc ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 arm ~mips ppc ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/protobuf-c-0.15 sys-libs/zlib ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6m ) ) !=net-im/kadu-0.6.0.2 !=net-im/kadu-0.6.0.1
 REQUIRED_USE=gnutls? ( ssl )
 SLOT=0
 SRC_URI=https://github.com/wojtekka/libgadu/archive/1.12.1.tar.gz -> libgadu-1.12.1.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=fdd3a307a3d1bf388b81d93bf3c26976
+_md5_=7c657f3475ffeb72f438c512221e4cc7
diff --git a/metadata/md5-cache/net-libs/libhubbub-0.3.0-r1 b/metadata/md5-cache/net-libs/libhubbub-0.3.0-r1
index 939e80b0aeff..d3a683e17a40 100644
--- a/metadata/md5-cache/net-libs/libhubbub-0.3.0-r1
+++ b/metadata/md5-cache/net-libs/libhubbub-0.3.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libparserutils-0.2.0-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(-)?] !net-libs/hubbub
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libhubbub-0.3.0-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.2.tar.gz -> netsurf-buildsystem-1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c28dffb7e33481a4dc7c741d02f09869
diff --git a/metadata/md5-cache/net-libs/libhubbub-0.3.1-r1 b/metadata/md5-cache/net-libs/libhubbub-0.3.1-r1
index c2b4eddf9bac..e0b2bd79771e 100644
--- a/metadata/md5-cache/net-libs/libhubbub-0.3.1-r1
+++ b/metadata/md5-cache/net-libs/libhubbub-0.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libparserutils-0.2.1-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(-)?] !net-libs/hubbub
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/libs/releases/libhubbub-0.3.1-src.tar.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.3.tar.gz -> netsurf-buildsystem-1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f55ea5d0d7b2daf481f3f34b06e70b58
diff --git a/metadata/md5-cache/net-libs/libndp-1.5 b/metadata/md5-cache/net-libs/libndp-1.5
index ca033a97457b..f7c7a9f1d656 100644
--- a/metadata/md5-cache/net-libs/libndp-1.5
+++ b/metadata/md5-cache/net-libs/libndp-1.5
@@ -8,5 +8,5 @@ KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://libndp.org/files/libndp-1.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a516ab77f302ac53b60b0c06ad5d3df8
diff --git a/metadata/md5-cache/net-libs/libnice-0.1.10 b/metadata/md5-cache/net-libs/libnice-0.1.10
index 4402055aa4dd..bb9372653a2f 100644
--- a/metadata/md5-cache/net-libs/libnice-0.1.10
+++ b/metadata/md5-cache/net-libs/libnice-0.1.10
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=test
 SLOT=0
 SRC_URI=http://nice.freedesktop.org/releases/libnice-0.1.10.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2316c6dc98be36eeaece0f196983b87e
diff --git a/metadata/md5-cache/net-libs/libnice-0.1.13 b/metadata/md5-cache/net-libs/libnice-0.1.13
index c442e951ae20..af35202e9537 100644
--- a/metadata/md5-cache/net-libs/libnice-0.1.13
+++ b/metadata/md5-cache/net-libs/libnice-0.1.13
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=test
 SLOT=0
 SRC_URI=http://nice.freedesktop.org/releases/libnice-0.1.13.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e2ed7fe2279c2788a3325ac0c5df58e3
diff --git a/metadata/md5-cache/net-libs/libnice-0.1.8 b/metadata/md5-cache/net-libs/libnice-0.1.8
index 1e505666fa90..2e593254174f 100644
--- a/metadata/md5-cache/net-libs/libnice-0.1.8
+++ b/metadata/md5-cache/net-libs/libnice-0.1.8
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=test
 SLOT=0
 SRC_URI=http://nice.freedesktop.org/releases/libnice-0.1.8.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=03ec5ed8d862779c59e301aaffcae5be
diff --git a/metadata/md5-cache/net-libs/libpcap-1.6.2-r1 b/metadata/md5-cache/net-libs/libpcap-1.6.2-r1
index 200fddd1c97a..122e6b439a68 100644
--- a/metadata/md5-cache/net-libs/libpcap-1.6.2-r1
+++ b/metadata/md5-cache/net-libs/libpcap-1.6.2-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=bluetooth? ( net-wireless/bluez:=[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(-)?] ) dbus? ( sys-apps/dbus[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(-)?] ) netlink? ( dev-libs/libnl:3[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(-)?] ) canusb? ( virtual/libusb:1[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
 SRC_URI=http://www.tcpdump.org/release/libpcap-1.6.2.tar.gz http://www.jp.tcpdump.org/release/libpcap-1.6.2.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=36702c058949c2f69a73d8e8101a0db2
diff --git a/metadata/md5-cache/net-libs/libpcap-1.7.3 b/metadata/md5-cache/net-libs/libpcap-1.7.3
index f9cf79af896b..11acda6d1015 100644
--- a/metadata/md5-cache/net-libs/libpcap-1.7.3
+++ b/metadata/md5-cache/net-libs/libpcap-1.7.3
@@ -4,10 +4,10 @@ DESCRIPTION=A system-independent library for user-level network packet capture
 EAPI=5
 HOMEPAGE=http://www.tcpdump.org/
 IUSE=bluetooth dbus ipv6 netlink static-libs canusb 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-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=bluetooth? ( net-wireless/bluez:=[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(-)?] ) dbus? ( sys-apps/dbus[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(-)?] ) netlink? ( dev-libs/libnl:3[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(-)?] ) canusb? ( virtual/libusb:1[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
 SRC_URI=http://www.tcpdump.org/release/libpcap-1.7.3.tar.gz http://www.jp.tcpdump.org/release/libpcap-1.7.3.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=28e7dfcb6f4ed83e54c5b5e6a24ea687
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=70efc5073941b6e298997fce65b2900f
diff --git a/metadata/md5-cache/net-libs/libpcap-9999 b/metadata/md5-cache/net-libs/libpcap-9999
index ca1ba670859f..005e602be4ae 100644
--- a/metadata/md5-cache/net-libs/libpcap-9999
+++ b/metadata/md5-cache/net-libs/libpcap-9999
@@ -7,5 +7,5 @@ IUSE=bluetooth dbus ipv6 netlink static-libs canusb abi_x86_32 abi_x86_64 abi_x8
 LICENSE=BSD
 RDEPEND=bluetooth? ( net-wireless/bluez:=[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(-)?] ) dbus? ( sys-apps/dbus[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(-)?] ) netlink? ( dev-libs/libnl:3[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(-)?] ) canusb? ( virtual/libusb:1[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
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=025aa2ccddd2e69d9088f5a0266077b9
diff --git a/metadata/md5-cache/net-libs/libproxy-0.4.11-r2 b/metadata/md5-cache/net-libs/libproxy-0.4.11-r2
index 4e8a73ed1d90..5ceb25e0c9f9 100644
--- a/metadata/md5-cache/net-libs/libproxy-0.4.11-r2
+++ b/metadata/md5-cache/net-libs/libproxy-0.4.11-r2
@@ -11,5 +11,5 @@ RDEPEND=gnome? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://libproxy.googlecode.com/files/libproxy-0.4.11.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	mono	203a4295c06155d318bdff9c6b2d5e1c	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	mono	203a4295c06155d318bdff9c6b2d5e1c	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e35193a4b2e3ff0ae0f35b7cd777a142
diff --git a/metadata/md5-cache/net-libs/libsoup-2.46.0-r1 b/metadata/md5-cache/net-libs/libsoup-2.46.0-r1
index 98055454f7fe..708d8804f1bf 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.46.0-r1
+++ b/metadata/md5-cache/net-libs/libsoup-2.46.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] >=dev-libs/libxml2-2.9.1-r4:2[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(-)?] >=dev-db/sqlite-3.8.2:3[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(-)?] >=net-libs/glib-networking-2.38.2[ssl?,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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) samba? ( net-fs/samba ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r8 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.46/libsoup-2.46.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3e2442a1d4b1e83d3db880fbd67eff60
diff --git a/metadata/md5-cache/net-libs/libsoup-2.48.1 b/metadata/md5-cache/net-libs/libsoup-2.48.1
index 8d0eb790604d..090624c619fa 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.48.1
+++ b/metadata/md5-cache/net-libs/libsoup-2.48.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=test
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.48/libsoup-2.48.1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c789b04d2831045ce076a4f602aae3d7
diff --git a/metadata/md5-cache/net-libs/libsoup-2.50.0 b/metadata/md5-cache/net-libs/libsoup-2.50.0
index 8e01bc0df3fb..e918f558ba88 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.50.0
+++ b/metadata/md5-cache/net-libs/libsoup-2.50.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] >=dev-libs/libxml2-2.9.1-r4:2[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(-)?] >=dev-db/sqlite-3.8.2:3[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(-)?] >=net-libs/glib-networking-2.38.2[ssl?,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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) samba? ( net-fs/samba ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r8 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.50/libsoup-2.50.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b18fb0eb104b2089dfc4a8bce01bbb92
diff --git a/metadata/md5-cache/net-libs/libsoup-gnome-2.46.0-r1 b/metadata/md5-cache/net-libs/libsoup-gnome-2.46.0-r1
index 6aa32a64e3c7..98b49c0fef0a 100644
--- a/metadata/md5-cache/net-libs/libsoup-gnome-2.46.0-r1
+++ b/metadata/md5-cache/net-libs/libsoup-gnome-2.46.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=~net-libs/libsoup-2.46.0[introspection?,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(-)?] dev-db/sqlite:3=[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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) >=net-libs/libsoup-2.42.2-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=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.46/libsoup-2.46.0.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=97efdfde1d4d321b28f788fc6556b75e
diff --git a/metadata/md5-cache/net-libs/libsoup-gnome-2.48.1 b/metadata/md5-cache/net-libs/libsoup-gnome-2.48.1
index e3e3d7e58439..0174b8d7586f 100644
--- a/metadata/md5-cache/net-libs/libsoup-gnome-2.48.1
+++ b/metadata/md5-cache/net-libs/libsoup-gnome-2.48.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=~net-libs/libsoup-2.48.1[introspection?,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(-)?] dev-db/sqlite:3=[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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) >=net-libs/libsoup-2.42.2-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=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.48/libsoup-2.48.1.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=19803c332e8b10acadf7cf7664e15570
diff --git a/metadata/md5-cache/net-libs/libsoup-gnome-2.50.0 b/metadata/md5-cache/net-libs/libsoup-gnome-2.50.0
index 2eb36822d6a2..319c161b6bb3 100644
--- a/metadata/md5-cache/net-libs/libsoup-gnome-2.50.0
+++ b/metadata/md5-cache/net-libs/libsoup-gnome-2.50.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=~net-libs/libsoup-2.50.0[introspection?,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(-)?] dev-db/sqlite:3=[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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) >=net-libs/libsoup-2.42.2-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=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.50/libsoup-2.50.0.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=204350d4df46e90128e8d55e6368f7a3
diff --git a/metadata/md5-cache/net-libs/libssh-0.6.5 b/metadata/md5-cache/net-libs/libssh-0.6.5
index 4d3946d1d211..9470a5646bfb 100644
--- a/metadata/md5-cache/net-libs/libssh-0.6.5
+++ b/metadata/md5-cache/net-libs/libssh-0.6.5
@@ -9,5 +9,5 @@ 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	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=76892732142e9341d017b45fb2ec53dd
diff --git a/metadata/md5-cache/net-libs/libssh-0.7.0 b/metadata/md5-cache/net-libs/libssh-0.7.0
index 8696dd9b3624..964ad4cc6211 100644
--- a/metadata/md5-cache/net-libs/libssh-0.7.0
+++ b/metadata/md5-cache/net-libs/libssh-0.7.0
@@ -9,5 +9,5 @@ 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/140/libssh-0.7.0.tar.xz -> libssh-0.7.0.tar.xz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=77963bbabf73b79ce6c765088ce756f0
diff --git a/metadata/md5-cache/net-libs/libssh-0.7.0-r1 b/metadata/md5-cache/net-libs/libssh-0.7.0-r1
index 7bc6825909fa..5d1cfbae0764 100644
--- a/metadata/md5-cache/net-libs/libssh-0.7.0-r1
+++ b/metadata/md5-cache/net-libs/libssh-0.7.0-r1
@@ -9,5 +9,5 @@ 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/140/libssh-0.7.0.tar.xz -> libssh-0.7.0.tar.xz https://projects.archlinux.org/svntogit/packages.git/plain/trunk/ssh_forward_listen.patch?h=packages/libssh&id=e7628675b7b5dec45371b67745ce786ee5b78d8c -> libssh-0.7.0-ssh_forward_listen.patch
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ddb3f4e87d2b9b0e8f46fde457f2378c
diff --git a/metadata/md5-cache/net-libs/libssh-9999 b/metadata/md5-cache/net-libs/libssh-9999
index 0f79f280206d..7ddf66ea7259 100644
--- a/metadata/md5-cache/net-libs/libssh-9999
+++ b/metadata/md5-cache/net-libs/libssh-9999
@@ -7,5 +7,5 @@ IUSE=debug doc examples gcrypt gssapi pcap +sftp ssh1 server static-libs test zl
 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
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=50cbd2740b419436375e9fde17072061
diff --git a/metadata/md5-cache/net-libs/libssh2-1.5.0 b/metadata/md5-cache/net-libs/libssh2-1.5.0
index caaba27f7e4e..ff1e7106d66a 100644
--- a/metadata/md5-cache/net-libs/libssh2-1.5.0
+++ b/metadata/md5-cache/net-libs/libssh2-1.5.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!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(-)?] ) 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(-)?] )
 SLOT=0
 SRC_URI=http://www.libssh2.org/download/libssh2-1.5.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=352212a739770378ed5be14cfe17bafd
diff --git a/metadata/md5-cache/net-libs/libssh2-1.6.0 b/metadata/md5-cache/net-libs/libssh2-1.6.0
index 927ec5d60491..7e6733a1ecb8 100644
--- a/metadata/md5-cache/net-libs/libssh2-1.6.0
+++ b/metadata/md5-cache/net-libs/libssh2-1.6.0
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=!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(-)?] ) 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(-)?] )
 SLOT=0
 SRC_URI=http://www.libssh2.org/download/libssh2-1.6.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=883f32c37f19449a22333e0c4c391d89
diff --git a/metadata/md5-cache/net-libs/libssh2-9999 b/metadata/md5-cache/net-libs/libssh2-9999
index f31f44d336a2..d6ccdd7fb645 100644
--- a/metadata/md5-cache/net-libs/libssh2-9999
+++ b/metadata/md5-cache/net-libs/libssh2-9999
@@ -7,5 +7,5 @@ IUSE=gcrypt static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32
 LICENSE=BSD
 RDEPEND=!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(-)?] ) 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(-)?] )
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b73e0a24cee53811c7bbabd13c9b13d9
diff --git a/metadata/md5-cache/net-libs/libtirpc-0.2.4-r2 b/metadata/md5-cache/net-libs/libtirpc-0.2.4-r2
index 2f045f3ebca6..8789950bcb46 100644
--- a/metadata/md5-cache/net-libs/libtirpc-0.2.4-r2
+++ b/metadata/md5-cache/net-libs/libtirpc-0.2.4-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kerberos? ( >=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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/libtirpc/libtirpc-0.2.4.tar.bz2 mirror://gentoo/libtirpc-glibc-nfs.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=807bda1cfce2bcaeeaa254b215cb8a3c
diff --git a/metadata/md5-cache/net-libs/libtirpc-0.2.5 b/metadata/md5-cache/net-libs/libtirpc-0.2.5
index 565c6a8eed36..3adfd0d606ef 100644
--- a/metadata/md5-cache/net-libs/libtirpc-0.2.5
+++ b/metadata/md5-cache/net-libs/libtirpc-0.2.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kerberos? ( >=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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/libtirpc/libtirpc-0.2.5.tar.bz2 mirror://gentoo/libtirpc-glibc-nfs.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b1c19b090aa30e40f96a999e7d61a552
diff --git a/metadata/md5-cache/net-libs/libtirpc-0.3.1 b/metadata/md5-cache/net-libs/libtirpc-0.3.1
index 635309bda96a..2a3ab32bd7bc 100644
--- a/metadata/md5-cache/net-libs/libtirpc-0.3.1
+++ b/metadata/md5-cache/net-libs/libtirpc-0.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kerberos? ( >=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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/libtirpc/libtirpc-0.3.1.tar.bz2 mirror://gentoo/libtirpc-glibc-nfs.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=339faae5b47a110440a2ac993b4186d2
diff --git a/metadata/md5-cache/net-libs/libvncserver-0.9.10 b/metadata/md5-cache/net-libs/libvncserver-0.9.10
index fbc15f1bdbee..72037a5d0686 100644
--- a/metadata/md5-cache/net-libs/libvncserver-0.9.10
+++ b/metadata/md5-cache/net-libs/libvncserver-0.9.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[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(-)?] >=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(-)?] ) !gnutls? ( ssl? ( >=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(-)?] ) ) jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) png? ( >=media-libs/libpng-1.6.10: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(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-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(-)?] )
 SLOT=0
 SRC_URI=https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.10.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=89642e1aa7ad85ff0d64289b83d717bf
diff --git a/metadata/md5-cache/net-libs/libvncserver-0.9.10-r1 b/metadata/md5-cache/net-libs/libvncserver-0.9.10-r1
index fad57448f872..723cb9f86bed 100644
--- a/metadata/md5-cache/net-libs/libvncserver-0.9.10-r1
+++ b/metadata/md5-cache/net-libs/libvncserver-0.9.10-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[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(-)?] >=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(-)?] ) !gnutls? ( ssl? ( >=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(-)?] ) ) jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) png? ( >=media-libs/libpng-1.6.10: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(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-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(-)?] )
 SLOT=0
 SRC_URI=https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.10.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ca22ee540807d82afb9b00b72bec72f3
diff --git a/metadata/md5-cache/net-libs/libvncserver-0.9.10-r3 b/metadata/md5-cache/net-libs/libvncserver-0.9.10-r3
index ec2dd218a783..d5f650648e14 100644
--- a/metadata/md5-cache/net-libs/libvncserver-0.9.10-r3
+++ b/metadata/md5-cache/net-libs/libvncserver-0.9.10-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=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(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6[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(-)?] >=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(-)?] ) !gnutls? ( ssl? ( >=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(-)?] ) ) jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) png? ( >=media-libs/libpng-1.6.10: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(-)?] ) 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(-)?] )
 SLOT=0
 SRC_URI=https://github.com/LibVNC/libvncserver/archive/LibVNCServer-0.9.10.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=3149ec7c8fd00be2cd16408d3765646d
diff --git a/metadata/md5-cache/net-libs/nacl-0_p20110221 b/metadata/md5-cache/net-libs/nacl-0_p20110221
index d7a9ad88b2cc..145e57919e22 100644
--- a/metadata/md5-cache/net-libs/nacl-0_p20110221
+++ b/metadata/md5-cache/net-libs/nacl-0_p20110221
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://hyperelliptic.org/nacl/nacl-20110221.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=5496f6742e696b2cb5c420d810e081a1
diff --git a/metadata/md5-cache/net-libs/neon-0.30.0-r1 b/metadata/md5-cache/net-libs/neon-0.30.0-r1
index c54b03d029fb..682f198c3af0 100644
--- a/metadata/md5-cache/net-libs/neon-0.30.0-r1
+++ b/metadata/md5-cache/net-libs/neon-0.30.0-r1
@@ -10,5 +10,5 @@ RDEPEND=expat? ( >=dev-libs/expat-2.1.0-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_
 RESTRICT=test
 SLOT=0/27
 SRC_URI=http://www.webdav.org/neon/neon-0.30.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4adb2c78268a869bbdb3616c9c517545
diff --git a/metadata/md5-cache/net-libs/neon-0.30.1 b/metadata/md5-cache/net-libs/neon-0.30.1
index af03e52b9c8f..b7e54b8ef2a8 100644
--- a/metadata/md5-cache/net-libs/neon-0.30.1
+++ b/metadata/md5-cache/net-libs/neon-0.30.1
@@ -10,5 +10,5 @@ RDEPEND=expat? ( dev-libs/expat:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0/27
 SRC_URI=http://www.webdav.org/neon/neon-0.30.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a176070e3cee2110a7cd5a9f0d1f607d
diff --git a/metadata/md5-cache/net-libs/nghttp2-0.7.15 b/metadata/md5-cache/net-libs/nghttp2-0.7.15
index 78412ee0dcba..8f50f8262d7e 100644
--- a/metadata/md5-cache/net-libs/nghttp2-0.7.15
+++ b/metadata/md5-cache/net-libs/nghttp2-0.7.15
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=cxx? ( dev-libs/boost[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(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc ) utils? ( >=dev-libs/libev-4.15 >=dev-libs/openssl-1.0.2 >=sys-libs/zlib-1.2.3 ) xml? ( >=dev-libs/libxml2-2.7.7 )
 SLOT=0/1.5
 SRC_URI=https://github.com/tatsuhiro-t/nghttp2/releases/download/v0.7.15/nghttp2-0.7.15.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=343711d0d98198bd9e20310751b4744f
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.0.1 b/metadata/md5-cache/net-libs/nghttp2-1.0.1
index 38df2e281f24..717847b653d2 100644
--- a/metadata/md5-cache/net-libs/nghttp2-1.0.1
+++ b/metadata/md5-cache/net-libs/nghttp2-1.0.1
@@ -8,5 +8,5 @@ LICENSE=MIT
 RDEPEND=cxx? ( dev-libs/boost[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(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc ) utils? ( >=dev-libs/libev-4.15 >=dev-libs/openssl-1.0.2 >=sys-libs/zlib-1.2.3 ) xml? ( >=dev-libs/libxml2-2.7.7 )
 SLOT=0/1.14
 SRC_URI=https://github.com/tatsuhiro-t/nghttp2/releases/download/v1.0.1/nghttp2-1.0.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=57fc98405fdc14d2306024036d4356fd
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.0.2 b/metadata/md5-cache/net-libs/nghttp2-1.0.2
index aa0d1e26e04d..ce9e051b4b88 100644
--- a/metadata/md5-cache/net-libs/nghttp2-1.0.2
+++ b/metadata/md5-cache/net-libs/nghttp2-1.0.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=cxx? ( dev-libs/boost[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(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc ) utils? ( >=dev-libs/libev-4.15 >=dev-libs/openssl-1.0.2 >=sys-libs/zlib-1.2.3 ) xml? ( >=dev-libs/libxml2-2.7.7 )
 SLOT=0/1.14
 SRC_URI=https://github.com/tatsuhiro-t/nghttp2/releases/download/v1.0.2/nghttp2-1.0.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=70f9b5749dd3a5f08f66981d6179f854
diff --git a/metadata/md5-cache/net-libs/nghttp2-9999 b/metadata/md5-cache/net-libs/nghttp2-9999
index 89672527d18b..d9ccc51f7ca8 100644
--- a/metadata/md5-cache/net-libs/nghttp2-9999
+++ b/metadata/md5-cache/net-libs/nghttp2-9999
@@ -7,5 +7,5 @@ IUSE=cxx debug hpack-tools jemalloc static-libs test +threads utils xml abi_x86_
 LICENSE=MIT
 RDEPEND=cxx? ( dev-libs/boost[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(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc ) utils? ( >=dev-libs/libev-4.15 >=dev-libs/openssl-1.0.2 >=sys-libs/zlib-1.2.3 ) xml? ( >=dev-libs/libxml2-2.7.7 )
 SLOT=0/1.14
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=20c15dd7f59bf9a5a67b450564e5c1f4
diff --git a/metadata/md5-cache/net-libs/polarssl-1.3.8 b/metadata/md5-cache/net-libs/polarssl-1.3.8
index d1b86a3a3a97..95c0e7cfd141 100644
--- a/metadata/md5-cache/net-libs/polarssl-1.3.8
+++ b/metadata/md5-cache/net-libs/polarssl-1.3.8
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=programs? ( dev-libs/openssl:0 ) 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(-)?] )
 SLOT=0/7
 SRC_URI=http://polarssl.org/download/polarssl-1.3.8-gpl.tgz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=34c3c3fc7c258ea0313d58eb3a1d9835
diff --git a/metadata/md5-cache/net-libs/polarssl-1.3.9 b/metadata/md5-cache/net-libs/polarssl-1.3.9
index dd99f69b6a4e..6fc0d13e09f2 100644
--- a/metadata/md5-cache/net-libs/polarssl-1.3.9
+++ b/metadata/md5-cache/net-libs/polarssl-1.3.9
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=programs? ( dev-libs/openssl:0 ) 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(-)?] )
 SLOT=0/7
 SRC_URI=http://polarssl.org/download/polarssl-1.3.9-gpl.tgz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=28b1c00abe897f8efc54341a6b2574bb
diff --git a/metadata/md5-cache/net-libs/rest-0.7.92-r1 b/metadata/md5-cache/net-libs/rest-0.7.92-r1
index 1f06ac329de2..f94baf9487c9 100644
--- a/metadata/md5-cache/net-libs/rest-0.7.92-r1
+++ b/metadata/md5-cache/net-libs/rest-0.7.92-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-misc/ca-certificates >=dev-libs/glib-2.24:2[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(-)?] dev-libs/libxml2:2[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(-)?] net-libs/libsoup:2.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(-)?] gnome? ( >=net-libs/libsoup-gnome-2.25.1:2.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
 SLOT=0.7
 SRC_URI=mirror://gnome/sources/rest/0.7/rest-0.7.92.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=8efea7979bca0760bbcfed8c099bc3bf
diff --git a/metadata/md5-cache/net-libs/rest-0.7.92-r2 b/metadata/md5-cache/net-libs/rest-0.7.92-r2
index c85ede450dd7..9b27b521a25b 100644
--- a/metadata/md5-cache/net-libs/rest-0.7.92-r2
+++ b/metadata/md5-cache/net-libs/rest-0.7.92-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-misc/ca-certificates >=dev-libs/glib-2.24:2[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(-)?] dev-libs/libxml2:2[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(-)?] net-libs/libsoup:2.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(-)?] gnome? ( >=net-libs/libsoup-gnome-2.25.1:2.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
 SLOT=0.7
 SRC_URI=mirror://gnome/sources/rest/0.7/rest-0.7.92.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=b73d3c7b440370249cea4c23de2149d2
diff --git a/metadata/md5-cache/net-libs/rest-0.7.93 b/metadata/md5-cache/net-libs/rest-0.7.93
index 41085e188799..012fed943393 100644
--- a/metadata/md5-cache/net-libs/rest-0.7.93
+++ b/metadata/md5-cache/net-libs/rest-0.7.93
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=app-misc/ca-certificates >=dev-libs/glib-2.24:2[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(-)?] dev-libs/libxml2:2[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(-)?] net-libs/libsoup:2.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(-)?] gnome? ( >=net-libs/libsoup-gnome-2.25.1:2.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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
 SLOT=0.7
 SRC_URI=mirror://gnome/sources/rest/0.7/rest-0.7.93.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=4480ed8668b2879614020f605195fb83
diff --git a/metadata/md5-cache/net-libs/socket_wrapper-1.1.3 b/metadata/md5-cache/net-libs/socket_wrapper-1.1.3
index 9b97a2d62bd6..099bff5a1446 100644
--- a/metadata/md5-cache/net-libs/socket_wrapper-1.1.3
+++ b/metadata/md5-cache/net-libs/socket_wrapper-1.1.3
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=ftp://ftp.samba.org/pub/cwrap/socket_wrapper-1.1.3.tar.gz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8b0b500488d2165b7d18ad9a3a2dcbdf
diff --git a/metadata/md5-cache/net-mail/cyrus-imapd-2.4.17-r1 b/metadata/md5-cache/net-mail/cyrus-imapd-2.4.17-r1
index 42f32a81eadc..8ac577f19eef 100644
--- a/metadata/md5-cache/net-mail/cyrus-imapd-2.4.17-r1
+++ b/metadata/md5-cache/net-mail/cyrus-imapd-2.4.17-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst preinst prepare setup
-DEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2 ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite ) ssl? ( >=dev-libs/openssl-0.9.6 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl )
+DEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2 ) kerberos? ( virtual/krb5 ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite ) ssl? ( >=dev-libs/openssl-0.9.6 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ssl? ( dev-libs/openssl )
 DESCRIPTION=The Cyrus IMAP Server
 EAPI=4
 HOMEPAGE=http://www.cyrusimap.org/
 IUSE=afs berkdb kerberos mysql nntp pam postgres replication sieve snmp sqlite ssl tcpd ssl
 KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=BSD-with-attribution
-RDEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2 ) kerberos? ( virtual/krb5 ) mysql? ( virtual/mysql ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite ) ssl? ( >=dev-libs/openssl-0.9.6 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) !mail-mta/courier !net-mail/bincimap !net-mail/courier-imap !net-mail/uw-imap
+RDEPEND=sys-libs/zlib >=dev-libs/cyrus-sasl-2.1.13 afs? ( net-fs/openafs ) berkdb? ( >=sys-libs/db-3.2 ) kerberos? ( virtual/krb5 ) mysql? ( >=virtual/mysql-5.5 ) nntp? ( !net-nntp/leafnode ) pam? ( virtual/pam >=net-mail/mailbase-1 ) postgres? ( dev-db/postgresql ) snmp? ( >=net-analyzer/net-snmp-5.2.2-r1 ) sqlite? ( dev-db/sqlite ) ssl? ( >=dev-libs/openssl-0.9.6 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 snmp? ( net-analyzer/net-snmp[tcpd=] ) ) !mail-mta/courier !net-mail/bincimap !net-mail/courier-imap !net-mail/uw-imap
 REQUIRED_USE=afs? ( kerberos )
 SLOT=0
 SRC_URI=ftp://ftp.cyrusimap.org/cyrus-imapd/cyrus-imapd-2.4.17.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	ssl-cert	b53367370fde96e19beca78050a47c61	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=2c6c739769f8783df4b0ba71a8ef241a
+_md5_=961339233dc6b7d0bc5184630b2a5bfd
diff --git a/metadata/md5-cache/net-misc/curl-7.42.0 b/metadata/md5-cache/net-misc/curl-7.42.0
index 81c73f150cda..3662b39ba00c 100644
--- a/metadata/md5-cache/net-misc/curl-7.42.0
+++ b/metadata/md5-cache/net-misc/curl-7.42.0
@@ -11,5 +11,5 @@ REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( cur
 RESTRICT=test
 SLOT=0
 SRC_URI=http://curl.haxx.se/download/curl-7.42.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0ac0c8d81669a04ed47a9776d4a9fb3a
diff --git a/metadata/md5-cache/net-misc/curl-7.42.1 b/metadata/md5-cache/net-misc/curl-7.42.1
index e33971893e5b..5be8b1839112 100644
--- a/metadata/md5-cache/net-misc/curl-7.42.1
+++ b/metadata/md5-cache/net-misc/curl-7.42.1
@@ -11,5 +11,5 @@ REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( cur
 RESTRICT=test
 SLOT=0
 SRC_URI=http://curl.haxx.se/download/curl-7.42.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6808a28a9eb4201ec9409d4ce1ed93d7
diff --git a/metadata/md5-cache/net-misc/curl-7.42.1-r1 b/metadata/md5-cache/net-misc/curl-7.42.1-r1
index 5e5f525007ca..475ad2a52962 100644
--- a/metadata/md5-cache/net-misc/curl-7.42.1-r1
+++ b/metadata/md5-cache/net-misc/curl-7.42.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( cur
 RESTRICT=test
 SLOT=0
 SRC_URI=http://curl.haxx.se/download/curl-7.42.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=487771f553d43d17005f948cadc86df4
diff --git a/metadata/md5-cache/net-misc/curl-7.43.0 b/metadata/md5-cache/net-misc/curl-7.43.0
index cfe4687e1514..41980192366a 100644
--- a/metadata/md5-cache/net-misc/curl-7.43.0
+++ b/metadata/md5-cache/net-misc/curl-7.43.0
@@ -11,5 +11,5 @@ REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( cur
 RESTRICT=test
 SLOT=0
 SRC_URI=http://curl.haxx.se/download/curl-7.43.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a9792a9f0ad266f8fcccd1711a539620
diff --git a/metadata/md5-cache/net-misc/i2pd-9999 b/metadata/md5-cache/net-misc/i2pd-9999
index 7f34a5ef186d..a242b499fec3 100644
--- a/metadata/md5-cache/net-misc/i2pd-9999
+++ b/metadata/md5-cache/net-misc/i2pd-9999
@@ -7,5 +7,5 @@ IUSE=cpu_flags_x86_aes i2p-hardening library static abi_x86_32 abi_x86_64 abi_x8
 LICENSE=GPL-2
 RDEPEND=!static? ( >=dev-libs/boost-1.46[threads] ) !static? ( dev-libs/crypto++ ) library? ( >=dev-libs/boost-1.46[threads,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(-)?] ) library? ( dev-libs/crypto++[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
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=1e328e0f4efb7592e75758046d43b177
diff --git a/metadata/md5-cache/net-misc/memcached-1.4.24 b/metadata/md5-cache/net-misc/memcached-1.4.24
index 65ccb9d3c518..51da38eb2c09 100644
--- a/metadata/md5-cache/net-misc/memcached-1.4.24
+++ b/metadata/md5-cache/net-misc/memcached-1.4.24
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=5
 HOMEPAGE=http://code.google.com/p/memcached/
 IUSE=test slabs-reassign debug sasl selinux
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-memcached )
 SLOT=0
 SRC_URI=http://www.memcached.org/files/memcached-1.4.24.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=a803cd2b292dbde1e8ed4d22cdd424ac
+_md5_=b4f82e94bc9f4e78253cacc05c60002e
diff --git a/metadata/md5-cache/net-misc/minidlna-1.1.4 b/metadata/md5-cache/net-misc/minidlna-1.1.4
index 4b57f1f2d7f9..2f1251eeccb9 100644
--- a/metadata/md5-cache/net-misc/minidlna-1.1.4
+++ b/metadata/md5-cache/net-misc/minidlna-1.1.4
@@ -4,10 +4,10 @@ DESCRIPTION=DLNA/UPnP-AV compliant media server
 EAPI=5
 HOMEPAGE=http://minidlna.sourceforge.net/
 IUSE=netgear readynas
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=BSD GPL-2
 RDEPEND=dev-db/sqlite:3 media-libs/flac media-libs/libexif media-libs/libid3tag media-libs/libogg media-libs/libvorbis virtual/ffmpeg virtual/jpeg:0
 SLOT=0
 SRC_URI=mirror://sourceforge/minidlna/1.1.4/minidlna-1.1.4.tar.gz http://dev.gentoo.org/~xmw/minidlna-gentoo-artwork.patch.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=703f5b4ce4fe80d369399063ec7b0d47
+_md5_=56fb83ce00e4f302c15419189c3d2263
diff --git a/metadata/md5-cache/net-misc/mosh-9999 b/metadata/md5-cache/net-misc/mosh-9999
index 32477f948171..36c5c98bd169 100644
--- a/metadata/md5-cache/net-misc/mosh-9999
+++ b/metadata/md5-cache/net-misc/mosh-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl
 REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=64675259cba1b859768bf1d168d25a6d
+_md5_=8015c2391b5c28436989ea9833628a55
diff --git a/metadata/md5-cache/net-misc/ofono-1.16 b/metadata/md5-cache/net-misc/ofono-1.16
index 351bed1fc41c..bf52f9918294 100644
--- a/metadata/md5-cache/net-misc/ofono-1.16
+++ b/metadata/md5-cache/net-misc/ofono-1.16
@@ -4,11 +4,11 @@ DESCRIPTION=Open Source mobile telephony (GSM/UMTS) daemon
 EAPI=5
 HOMEPAGE=http://ofono.org/
 IUSE=+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem threads tools +udev
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/dbus-1.4 >=dev-libs/glib-2.28 net-misc/mobile-broadband-provider-info bluetooth? ( >=net-wireless/bluez-4.99 ) udev? ( virtual/udev ) examples? ( dev-python/dbus-python ) tools? ( virtual/libusb:1 )
 REQUIRED_USE=dundee? ( bluetooth )
 SLOT=0
 SRC_URI=mirror://kernel/linux/network/ofono/ofono-1.16.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=ace9ddea7204825bd90c1b246f12c437
+_md5_=5e6c43eff09adc579b07320cbf25e4bc
diff --git a/metadata/md5-cache/net-misc/owncloud-client-1.8.3 b/metadata/md5-cache/net-misc/owncloud-client-1.8.3
new file mode 100644
index 000000000000..19d61981e827
--- /dev/null
+++ b/metadata/md5-cache/net-misc/owncloud-client-1.8.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-db/sqlite-3.4:3 sys-fs/inotify-tools virtual/libiconv nautilus? ( dev-python/nautilus-python ) qt4? ( dev-libs/qtkeychain[qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsql:4 dev-qt/qtwebkit:4 net-libs/neon[ssl] ) qt5? ( dev-libs/qtkeychain[qt5] dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 >=dev-qt/qtnetwork-5.4:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5[printsupport] ) samba? ( >=net-fs/samba-3.5 ) sftp? ( >=net-libs/libssh-0.5 ) !net-misc/ocsync doc? ( dev-python/sphinx dev-texlive/texlive-latexextra virtual/latex-base ) test? ( dev-util/cmocka qt4? ( dev-qt/qttest:4 ) qt5? ( dev-qt/qttest:5 ) ) sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Synchronize files from ownCloud Server with your computer
+EAPI=5
+HOMEPAGE=http://owncloud.org/
+IUSE=doc nautilus samba +sftp test qt4 +qt5
+KEYWORDS=~amd64 ~x86
+LICENSE=CC-BY-3.0 GPL-2
+RDEPEND=>=dev-db/sqlite-3.4:3 sys-fs/inotify-tools virtual/libiconv nautilus? ( dev-python/nautilus-python ) qt4? ( dev-libs/qtkeychain[qt4] dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsql:4 dev-qt/qtwebkit:4 net-libs/neon[ssl] ) qt5? ( dev-libs/qtkeychain[qt5] dev-qt/linguist-tools:5 dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 >=dev-qt/qtnetwork-5.4:5 dev-qt/qtgui:5 dev-qt/qtquickcontrols:5 dev-qt/qtsql:5 dev-qt/qtwebkit:5[printsupport] ) samba? ( >=net-fs/samba-3.5 ) sftp? ( >=net-libs/libssh-0.5 ) !net-misc/ocsync
+REQUIRED_USE=^^ ( qt4 qt5 )
+SLOT=0
+SRC_URI=http://download.owncloud.com/desktop/stable/owncloudclient-1.8.3.tar.xz
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=daef7d644c768a0a84122226cf9d56a2
diff --git a/metadata/md5-cache/net-misc/usbip-3.19 b/metadata/md5-cache/net-misc/usbip-3.19
index 1126f8723fd6..a750580d51c7 100644
--- a/metadata/md5-cache/net-misc/usbip-3.19
+++ b/metadata/md5-cache/net-misc/usbip-3.19
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.6 sys-apps/hwids >=sys-kernel/linux-headers-3.17 virtual/libudev tcpd? ( sys-apps/tcp-wrappers ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ed4f20af458c3237556535586adbb199
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.38-r2 b/metadata/md5-cache/net-nds/openldap-2.4.38-r2
index 4a5b034da40a..04176c2426c8 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.38-r2
+++ b/metadata/md5-cache/net-nds/openldap-2.4.38-r2
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[a
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.38.tgz mirror://gentoo/rfc2307bis.schema-20140524
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=acd0d0cdc1caa55b3e515095d6d08336
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.39 b/metadata/md5-cache/net-nds/openldap-2.4.39
index 52795dc77840..072293fa2aee 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.39
+++ b/metadata/md5-cache/net-nds/openldap-2.4.39
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[a
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.39.tgz mirror://gentoo/rfc2307bis.schema-20140524
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=75672eb457d9d07093558a74ada20530
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.40 b/metadata/md5-cache/net-nds/openldap-2.4.40
index 9120bd6d3af7..b1849371b16a 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.40
+++ b/metadata/md5-cache/net-nds/openldap-2.4.40
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[a
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.40.tgz mirror://gentoo/rfc2307bis.schema-20140524
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ece9be7062c649eeec6572e1a1168953
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.40-r2 b/metadata/md5-cache/net-nds/openldap-2.4.40-r2
index 38960604fd73..a7ebb057181b 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.40-r2
+++ b/metadata/md5-cache/net-nds/openldap-2.4.40-r2
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[a
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.40.tgz mirror://gentoo/rfc2307bis.schema-20140524
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e0e9e9b1b5b692b728203076845edb48
diff --git a/metadata/md5-cache/net-nds/openldap-2.4.40-r3 b/metadata/md5-cache/net-nds/openldap-2.4.40-r3
index 51596697fc50..2dbb650230db 100644
--- a/metadata/md5-cache/net-nds/openldap-2.4.40-r3
+++ b/metadata/md5-cache/net-nds/openldap-2.4.40-r3
@@ -10,5 +10,5 @@ RDEPEND=icu? ( dev-libs/icu:= ) ssl? ( !gnutls? ( >=dev-libs/openssl-1.0.1h-r2[a
 REQUIRED_USE=cxx? ( sasl )
 SLOT=0
 SRC_URI=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/openldap-2.4.40.tgz mirror://gentoo/rfc2307bis.schema-20140524
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	ssl-cert	b53367370fde96e19beca78050a47c61	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8232d938e2e050a1a9c125c6455cdad9
diff --git a/metadata/md5-cache/net-print/cups-1.7.5 b/metadata/md5-cache/net-print/cups-1.7.5
index 8fdc2e1661c4..bfea078fb37b 100644
--- a/metadata/md5-cache/net-print/cups-1.7.5
+++ b/metadata/md5-cache/net-print/cups-1.7.5
@@ -12,5 +12,5 @@ REQUIRED_USE=gnutls? ( ssl ) python? ( python_targets_python2_7 ) usb? ( threads
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cups.org/software/1.7.5/cups-1.7.5-source.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=61380ce4132aeb29cb889bdde43f4d00
diff --git a/metadata/md5-cache/net-print/cups-1.7.5-r2 b/metadata/md5-cache/net-print/cups-1.7.5-r2
index 978a37661755..d43aede99645 100644
--- a/metadata/md5-cache/net-print/cups-1.7.5-r2
+++ b/metadata/md5-cache/net-print/cups-1.7.5-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=gnutls? ( ssl ) python? ( python_targets_python2_7 ) usb? ( threads
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cups.org/software/1.7.5/cups-1.7.5-source.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2ffbb47b5ecd0c7f8fb176ee14c88a79
diff --git a/metadata/md5-cache/net-print/cups-1.7.9999 b/metadata/md5-cache/net-print/cups-1.7.9999
index bcf4e4c11707..ece4d98bc085 100644
--- a/metadata/md5-cache/net-print/cups-1.7.9999
+++ b/metadata/md5-cache/net-print/cups-1.7.9999
@@ -10,5 +10,5 @@ RDEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
 REQUIRED_USE=gnutls? ( ssl ) python? ( python_targets_python2_7 ) usb? ( threads )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f9e01132f3436ef43fe4b1e6ec5fb7fd
diff --git a/metadata/md5-cache/net-print/cups-2.0.0-r2 b/metadata/md5-cache/net-print/cups-2.0.0-r2
index 7ccf9531f281..74aa7b356f55 100644
--- a/metadata/md5-cache/net-print/cups-2.0.0-r2
+++ b/metadata/md5-cache/net-print/cups-2.0.0-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cups.org/software/2.0.0/cups-2.0.0-source.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c09b1c8d0d823cdc2e8f64929e94af18
diff --git a/metadata/md5-cache/net-print/cups-2.0.1-r1 b/metadata/md5-cache/net-print/cups-2.0.1-r1
index 54abcc21d048..b12156f6dc32 100644
--- a/metadata/md5-cache/net-print/cups-2.0.1-r1
+++ b/metadata/md5-cache/net-print/cups-2.0.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cups.org/software/2.0.1/cups-2.0.1-source.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c88db9940c786ce3fb832c2a0fb3e317
diff --git a/metadata/md5-cache/net-print/cups-2.0.2 b/metadata/md5-cache/net-print/cups-2.0.2
index 58c3b300cc2f..bb044df59c7c 100644
--- a/metadata/md5-cache/net-print/cups-2.0.2
+++ b/metadata/md5-cache/net-print/cups-2.0.2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cups.org/software/2.0.2/cups-2.0.2-source.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=03d968349066aff0f3988ae2dbf2a3e2
diff --git a/metadata/md5-cache/net-print/cups-2.0.2-r1 b/metadata/md5-cache/net-print/cups-2.0.2-r1
index cb66bd5c4c68..cc5ce41464a8 100644
--- a/metadata/md5-cache/net-print/cups-2.0.2-r1
+++ b/metadata/md5-cache/net-print/cups-2.0.2-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cups.org/software/2.0.2/cups-2.0.2-source.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=de34ec780b61b9b4493704b7277ad9be
diff --git a/metadata/md5-cache/net-print/cups-2.0.2-r2 b/metadata/md5-cache/net-print/cups-2.0.2-r2
index ee22f41bcfb3..14f3dcd26990 100644
--- a/metadata/md5-cache/net-print/cups-2.0.2-r2
+++ b/metadata/md5-cache/net-print/cups-2.0.2-r2
@@ -12,5 +12,5 @@ REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.cups.org/software/2.0.2/cups-2.0.2-source.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9a1145bc4419f3a7422758ac53555cce
diff --git a/metadata/md5-cache/net-print/cups-9999 b/metadata/md5-cache/net-print/cups-9999
index 3e61f3172d5c..a398b44613a8 100644
--- a/metadata/md5-cache/net-print/cups-9999
+++ b/metadata/md5-cache/net-print/cups-9999
@@ -10,5 +10,5 @@ RDEPEND=app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) )
 REQUIRED_USE=python? ( python_targets_python2_7 ) usb? ( threads )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9a73f0e51a1b4ee9d1003f71c6be844e
diff --git a/metadata/md5-cache/net-print/libgnomecups-0.2.3-r5 b/metadata/md5-cache/net-print/libgnomecups-0.2.3-r5
index 0470b5e1c6f0..44036941bbe4 100644
--- a/metadata/md5-cache/net-print/libgnomecups-0.2.3-r5
+++ b/metadata/md5-cache/net-print/libgnomecups-0.2.3-r5
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] >=net-print/cups-1.7.1-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
 SRC_URI=mirror://gnome/sources/libgnomecups/0.2/libgnomecups-0.2.3.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7e28aed6428b73b2642ac84b340e2578
diff --git a/metadata/md5-cache/net-wireless/bluez-4.101-r9 b/metadata/md5-cache/net-wireless/bluez-4.101-r9
index 367007ee1c04..c0aeccb1d74d 100644
--- a/metadata/md5-cache/net-wireless/bluez-4.101-r9
+++ b/metadata/md5-cache/net-wireless/bluez-4.101-r9
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.6:= >=sys-apps/hwids-20121202.2
 REQUIRED_USE=test-programs? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://kernel/linux/bluetooth/bluez-4.101.tar.xz http://dev.gentoo.org/~pacho/bluez/bluez-4.101-patches.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=63a7628dd1aa3ab8e5142f383f80dec6
diff --git a/metadata/md5-cache/net-wireless/bluez-5.25 b/metadata/md5-cache/net-wireless/bluez-5.25
index 5803578c2e2a..6ec68fe0bb65 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.25
+++ b/metadata/md5-cache/net-wireless/bluez-5.25
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.6:= >=sys-apps/hwids-20121202.2
 REQUIRED_USE=test? ( )
 SLOT=0/3
 SRC_URI=mirror://kernel/linux/bluetooth/bluez-5.25.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=f8a148fc3cb0b30658c61b6feabb43df
diff --git a/metadata/md5-cache/net-wireless/bluez-5.28 b/metadata/md5-cache/net-wireless/bluez-5.28
index 8a8b9d262e92..e56dd7238bc4 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.28
+++ b/metadata/md5-cache/net-wireless/bluez-5.28
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.6:= >=sys-apps/hwids-20121202.2 cups? ( net-print/cups:= ) obex? ( dev-libs/libical ) readline? ( sys-libs/readline:= ) systemd? ( sys-apps/systemd ) udev? ( >=virtual/udev-172 ) abi_x86_32? ( !<app-emulation/emul-linux-x86-soundlibs-20140406-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32] ) selinux? ( sec-policy/selinux-bluetooth )
 SLOT=0/3
 SRC_URI=mirror://kernel/linux/bluetooth/bluez-5.28.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=f58cbfbe00f01d4a1f598b72ca47a051
diff --git a/metadata/md5-cache/net-wireless/bluez-5.30 b/metadata/md5-cache/net-wireless/bluez-5.30
index 4e7b63781b09..80d2c3571b33 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.30
+++ b/metadata/md5-cache/net-wireless/bluez-5.30
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.6:= >=sys-apps/hwids-20121202.2 cups? ( net-print/cups:= ) obex? ( dev-libs/libical ) readline? ( sys-libs/readline:= ) systemd? ( sys-apps/systemd ) udev? ( >=virtual/udev-172 ) abi_x86_32? ( !<app-emulation/emul-linux-x86-soundlibs-20140406-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32] ) selinux? ( sec-policy/selinux-bluetooth )
 SLOT=0/3
 SRC_URI=mirror://kernel/linux/bluetooth/bluez-5.30.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=9bbdad157a03b067111382589f3bf18f
diff --git a/metadata/md5-cache/net-wireless/bluez-5.31 b/metadata/md5-cache/net-wireless/bluez-5.31
index bfb11ac75b1c..d7abdb2c6c31 100644
--- a/metadata/md5-cache/net-wireless/bluez-5.31
+++ b/metadata/md5-cache/net-wireless/bluez-5.31
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.28:2 >=sys-apps/dbus-1.6:= >=sys-apps/hwids-20121202.2 cups? ( net-print/cups:= ) obex? ( dev-libs/libical:= ) readline? ( sys-libs/readline:= ) systemd? ( sys-apps/systemd ) udev? ( >=virtual/udev-172 ) abi_x86_32? ( !<app-emulation/emul-linux-x86-soundlibs-20140406-r1 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32] ) selinux? ( sec-policy/selinux-bluetooth )
 SLOT=0/3
 SRC_URI=mirror://kernel/linux/bluetooth/bluez-5.31.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=975690af1245038beb726a6ead63b4ec
diff --git a/metadata/md5-cache/sci-chemistry/freeon-1.0.10 b/metadata/md5-cache/sci-chemistry/freeon-1.0.10
new file mode 100644
index 000000000000..761df4055e25
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/freeon-1.0.10
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sci-libs/hdf5 virtual/blas virtual/lapack || ( >=dev-lang/python-2.7.5-r2:2.7 dev-lang/python:3.4 >=dev-lang/python-3.3.2-r2:3.3 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran
+DESCRIPTION=An experimental suite of programs for linear scaling quantum chemistry
+EAPI=5
+HOMEPAGE=http://www.freeon.org
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=sci-libs/hdf5 virtual/blas virtual/lapack virtual/fortran
+SLOT=0
+SRC_URI=http://download.savannah.gnu.org/releases/freeon/freeon-1.0.10.tar.bz2
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=26ba3772c32cfe21d696a2197bf4e171
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-2.3.2 b/metadata/md5-cache/sci-chemistry/openbabel-2.3.2
index 1fcf38f46ea9..1739584637bf 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-2.3.2
+++ b/metadata/md5-cache/sci-chemistry/openbabel-2.3.2
@@ -4,10 +4,10 @@ DESCRIPTION=Interconverts file formats used in molecular modeling
 EAPI=5
 HOMEPAGE=http://openbabel.sourceforge.net/
 IUSE=doc openmp test wxwidgets
-KEYWORDS=amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=!sci-chemistry/babel dev-cpp/eigen:3 dev-libs/libxml2:2 sci-libs/inchi sys-libs/zlib wxwidgets? ( x11-libs/wxGTK:2.8[X] )
 SLOT=0
 SRC_URI=mirror://sourceforge/openbabel/openbabel-2.3.2.tar.gz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	wxwidgets	6d6eec2685256d35511e7b6d5461bec9
-_md5_=dc1e7a2c4e7e0aef323e30786f57154a
+_md5_=f4c6cbeb5359b83a1a1c79c3a783c87b
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.2 b/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.2
index f51f986debb1..9c6ad3922145 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.2
+++ b/metadata/md5-cache/sci-chemistry/openbabel-perl-2.3.2
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:= ~sci-chemistry/openbabel-2.3.2 >=dev-util/cmake-2.4.8 >=d
 DESCRIPTION=Perl bindings for OpenBabel
 EAPI=5
 HOMEPAGE=http://openbabel.sourceforge.net/
-KEYWORDS=amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-lang/perl:= ~sci-chemistry/openbabel-2.3.2 dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://sourceforge/openbabel/openbabel-2.3.2.tar.gz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	perl-module	9ff260c452d420630500e700913be8d8	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
-_md5_=9735cb18796145c0ce04eecfc564fc6c
+_md5_=bd472c93b2777518e1bffc2d06596dc2
diff --git a/metadata/md5-cache/sci-chemistry/openbabel-python-2.3.2 b/metadata/md5-cache/sci-chemistry/openbabel-python-2.3.2
index 184e9bf1b470..a4914389cf04 100644
--- a/metadata/md5-cache/sci-chemistry/openbabel-python-2.3.2
+++ b/metadata/md5-cache/sci-chemistry/openbabel-python-2.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for OpenBabel (including Pybel)
 EAPI=5
 HOMEPAGE=http://openbabel.sourceforge.net/
 IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
-KEYWORDS=amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux ~x86-linux
 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(-)] !sci-chemistry/babel ~sci-chemistry/openbabel-2.3.2 sys-libs/zlib
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=mirror://sourceforge/openbabel/openbabel-2.3.2.tar.gz
 _eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=ee4ae23ae434d2f717e8266c99316185
+_md5_=362f23b6e74721a990652520f5dc2eb4
diff --git a/metadata/md5-cache/sci-libs/cln-1.3.3 b/metadata/md5-cache/sci-libs/cln-1.3.3
index 55765b39d369..0e46ce9378f6 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	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=70b81dc22be9d920ad532f47557d5612
+_md5_=cc643b4fc9ddb0995d6be0a18afc1ed1
diff --git a/metadata/md5-cache/sci-libs/djbfft-0.76-r2 b/metadata/md5-cache/sci-libs/djbfft-0.76-r2
index 3670f1a19322..d7e62a1e476c 100644
--- a/metadata/md5-cache/sci-libs/djbfft-0.76-r2
+++ b/metadata/md5-cache/sci-libs/djbfft-0.76-r2
@@ -7,5 +7,5 @@ KEYWORDS=alpha amd64 arm ~hppa ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~am
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://cr.yp.to/djbfft/djbfft-0.76.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0a5c7f33c1328af0499ee46a84dc7829
diff --git a/metadata/md5-cache/sci-libs/fftw-2.1.5-r8 b/metadata/md5-cache/sci-libs/fftw-2.1.5-r8
index 3241d4979c0c..5e9090673691 100644
--- a/metadata/md5-cache/sci-libs/fftw-2.1.5-r8
+++ b/metadata/md5-cache/sci-libs/fftw-2.1.5-r8
@@ -5,9 +5,9 @@ EAPI=4
 HOMEPAGE=http://www.fftw.org
 IUSE=doc float fortran mpi openmp threads static-libs
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=mpi? ( virtual/mpi ) fortran? ( virtual/fortran )
 SLOT=2.1
 SRC_URI=http://www.fftw.org/fftw-2.1.5.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=cdf91b44103884dd400049c814c0287a
+_md5_=189998f8a09838673dda915d00bca1e0
diff --git a/metadata/md5-cache/sci-libs/fftw-3.3.4 b/metadata/md5-cache/sci-libs/fftw-3.3.4
index b5c26aba55e2..3e44f3bb6039 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.3.4
+++ b/metadata/md5-cache/sci-libs/fftw-3.3.4
@@ -5,9 +5,9 @@ EAPI=5
 HOMEPAGE=http://www.fftw.org/
 IUSE=altivec cpu_flags_x86_avx doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran mpi neon openmp quad cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs test threads zbus 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 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
+LICENSE=GPL-2+
 RDEPEND=mpi? ( virtual/mpi ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2 !app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] ) fortran? ( virtual/fortran )
 SLOT=3.0/3
 SRC_URI=http://www.fftw.org/fftw-3.3.4.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=0566974824ab1c590c783a8019bbae18
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=a233fda976246a713addb17118d49b94
diff --git a/metadata/md5-cache/sci-libs/liborigin-20110829 b/metadata/md5-cache/sci-libs/liborigin-20110829
index 1d9cc6841bb5..0c6cb4f77043 100644
--- a/metadata/md5-cache/sci-libs/liborigin-20110829
+++ b/metadata/md5-cache/sci-libs/liborigin-20110829
@@ -4,10 +4,10 @@ DESCRIPTION=Library for reading OriginLab OPJ project files
 EAPI=5
 HOMEPAGE=http://soft.proindependent.com/liborigin2/
 IUSE=doc
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=dev-libs/boost dev-qt/qtgui:4
 SLOT=2
 SRC_URI=http://dev.gentoo.org/~dilfridge/distfiles/liborigin2-20110829.zip
 _eclasses_=base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	qmake-utils	8557b23f27697843c242ff27aaa99448	qt4-r2	7199e3db5b5908325487d379c6f67cf0	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=832e8dd42ae53438fdafa7b1b9316305
+_md5_=677e31c1f131e87513094098bf6aa1b5
diff --git a/metadata/md5-cache/sci-libs/pymmlib-1.2.1 b/metadata/md5-cache/sci-libs/pymmlib-1.2.1
index 3972e35d6eeb..0f61dac7152d 100644
--- a/metadata/md5-cache/sci-libs/pymmlib-1.2.1
+++ b/metadata/md5-cache/sci-libs/pymmlib-1.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=Toolkit and library for the analysis and manipulation of macromolecu
 EAPI=5
 HOMEPAGE=http://pymmlib.sourceforge.net/
 IUSE=doc python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=Artistic
 RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtkglext[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/freeglut virtual/glu virtual/opengl x11-libs/libXmu 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://github/masci/mmLib/pymmlib-1.2.1.tar.gz
 _eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=21d7fecd5ad1e97f7b064246c39cabfe
+_md5_=18b8e762ab8d213ffc388922cdc90856
diff --git a/metadata/md5-cache/sci-libs/xdrfile-1.1.1 b/metadata/md5-cache/sci-libs/xdrfile-1.1.1
index 96b09a30718d..2aa623a840bb 100644
--- a/metadata/md5-cache/sci-libs/xdrfile-1.1.1
+++ b/metadata/md5-cache/sci-libs/xdrfile-1.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=fortran? ( virtual/fortran )
 SLOT=0
 SRC_URI=ftp://ftp.gromacs.org/pub/contrib/xdrfile-1.1.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4adcc6fb7521a556012f73cf36636d06
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.4_p5 b/metadata/md5-cache/sci-mathematics/coq-8.4_p5
index 2943a0ba80c2..0afd2cd47733 100644
--- a/metadata/md5-cache/sci-mathematics/coq-8.4_p5
+++ b/metadata/md5-cache/sci-mathematics/coq-8.4_p5
@@ -4,10 +4,10 @@ DESCRIPTION=Proof assistant written in O'Caml
 EAPI=5
 HOMEPAGE=http://coq.inria.fr/
 IUSE=gtk debug +ocamlopt doc camlp5
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-3.11.2:=[ocamlopt?] camlp5? ( >=dev-ml/camlp5-6.02.3:=[ocamlopt?] ) !camlp5? ( || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 ) ) gtk? ( >=dev-ml/lablgtk-2.10.1:=[ocamlopt?] )
 SLOT=0
 SRC_URI=http://coq.inria.fr/distrib/V8.4pl5/files/coq-8.4pl5.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=7090a7270ed7ea63dc6d50f830dcaf5d
+_md5_=6e4b06aa8424aa666796cdf3c5a95848
diff --git a/metadata/md5-cache/sci-physics/lammps-20150515 b/metadata/md5-cache/sci-physics/lammps-20150515
index 64278175c1d5..8d3646d893b0 100644
--- a/metadata/md5-cache/sci-physics/lammps-20150515
+++ b/metadata/md5-cache/sci-physics/lammps-20150515
@@ -4,11 +4,11 @@ DESCRIPTION=Large-scale Atomic/Molecular Massively Parallel Simulator
 EAPI=5
 HOMEPAGE=http://lammps.sandia.gov/
 IUSE=doc examples gzip lammps-memalign mpi python static-libs python_targets_python2_7 python_targets_python3_3
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/blas virtual/lapack virtual/mpi ) gzip? ( app-arch/gzip ) sci-libs/voro++ 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] ) virtual/fortran
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_3 ) )
 SLOT=0
 SRC_URI=http://lammps.sandia.gov/tars/lammps-15May15.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	fortran-2	db8710b355fc5598015c4bc3aad3bdb0	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=a04c97af4bd645f998b4feefac8346f4
+_md5_=a5cd608faae699124b9d99a0a7f7b612
diff --git a/metadata/md5-cache/sys-apps/acl-2.2.52-r1 b/metadata/md5-cache/sys-apps/acl-2.2.52-r1
index 6cc890788bc0..5b9f6c0ac0bc 100644
--- a/metadata/md5-cache/sys-apps/acl-2.2.52-r1
+++ b/metadata/md5-cache/sys-apps/acl-2.2.52-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-apps/attr-2.4.47-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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://download.savannah.gnu.org/releases/acl/acl-2.2.52.src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c02215c876bf43d8a496805137a24212
diff --git a/metadata/md5-cache/sys-apps/attr-2.4.47-r1 b/metadata/md5-cache/sys-apps/attr-2.4.47-r1
index 5c86a9b6ee5d..cf83511db490 100644
--- a/metadata/md5-cache/sys-apps/attr-2.4.47-r1
+++ b/metadata/md5-cache/sys-apps/attr-2.4.47-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://nongnu/attr/attr-2.4.47.src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=70766a7c24bfbdccb92b31e41c25409b
diff --git a/metadata/md5-cache/sys-apps/attr-2.4.47-r2 b/metadata/md5-cache/sys-apps/attr-2.4.47-r2
index 344c5e3bb7a4..3a9a0c8104f5 100644
--- a/metadata/md5-cache/sys-apps/attr-2.4.47-r2
+++ b/metadata/md5-cache/sys-apps/attr-2.4.47-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://nongnu/attr/attr-2.4.47.src.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0042076c3454b033900c405b98c07b3e
diff --git a/metadata/md5-cache/sys-apps/dbus-1.8.16 b/metadata/md5-cache/sys-apps/dbus-1.8.16
index cfc4f786776e..bd7c3eaa8c4f 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.8.16
+++ b/metadata/md5-cache/sys-apps/dbus-1.8.16
@@ -9,5 +9,5 @@ LICENSE=|| ( AFL-2.1 GPL-2 )
 RDEPEND=>=dev-libs/expat-2 selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) selinux? ( sec-policy/selinux-dbus )
 SLOT=0
 SRC_URI=http://dbus.freedesktop.org/releases/dbus/dbus-1.8.16.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=f5a9c1812562f6bbc6459cc396f01661
diff --git a/metadata/md5-cache/sys-apps/dmapi-2.2.12-r1 b/metadata/md5-cache/sys-apps/dmapi-2.2.12-r1
index 35561d86a0b5..1430fff777ab 100644
--- a/metadata/md5-cache/sys-apps/dmapi-2.2.12-r1
+++ b/metadata/md5-cache/sys-apps/dmapi-2.2.12-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=sys-fs/xfsprogs
 SLOT=0
 SRC_URI=ftp://oss.sgi.com/projects/xfs/cmd_tars/dmapi-2.2.12.tar.gz ftp://oss.sgi.com/projects/xfs/previous/cmd_tars/dmapi-2.2.12.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=bbec42f561f7bb18c6938278db26564f
diff --git a/metadata/md5-cache/sys-apps/file-5.22 b/metadata/md5-cache/sys-apps/file-5.22
index bbc2d7795b02..472d061958d2 100644
--- a/metadata/md5-cache/sys-apps/file-5.22
+++ b/metadata/md5-cache/sys-apps/file-5.22
@@ -9,5 +9,5 @@ LICENSE=BSD-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(-)] ) 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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r21 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) python? ( !dev-python/python-magic )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.22.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.22.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=5bc87e38839ef0c9cdce741c68b98313
diff --git a/metadata/md5-cache/sys-apps/file-5.22-r1 b/metadata/md5-cache/sys-apps/file-5.22-r1
index 1a48869e2a21..2552228946ac 100644
--- a/metadata/md5-cache/sys-apps/file-5.22-r1
+++ b/metadata/md5-cache/sys-apps/file-5.22-r1
@@ -9,5 +9,5 @@ LICENSE=BSD-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 ) 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(-)] ) 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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r21 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) python? ( !dev-python/python-magic )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.22.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.22.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a33ee71ef8268fe25e6b04bbee3bf367
diff --git a/metadata/md5-cache/sys-apps/file-5.23 b/metadata/md5-cache/sys-apps/file-5.23
index 9a79133a338e..bcf6e73bb59f 100644
--- a/metadata/md5-cache/sys-apps/file-5.23
+++ b/metadata/md5-cache/sys-apps/file-5.23
@@ -9,5 +9,5 @@ LICENSE=BSD-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 ) 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(-)] ) 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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r21 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) python? ( !dev-python/python-magic )
 SLOT=0
 SRC_URI=ftp://ftp.astron.com/pub/file/file-5.23.tar.gz ftp://ftp.gw.com/mirrors/pub/unix/file/file-5.23.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d9699d14f20d1f196b3dc9f9dd61f6a3
diff --git a/metadata/md5-cache/sys-apps/file-9999 b/metadata/md5-cache/sys-apps/file-9999
index 29efcb923ff8..33c0a1215d14 100644
--- a/metadata/md5-cache/sys-apps/file-9999
+++ b/metadata/md5-cache/sys-apps/file-9999
@@ -7,5 +7,5 @@ IUSE=python static-libs zlib python_targets_python2_7 python_targets_python3_3 p
 LICENSE=BSD-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 ) 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(-)] ) 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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r21 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) python? ( !dev-python/python-magic )
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e5394a59509f3b0d2702e9964a5738ca
diff --git a/metadata/md5-cache/sys-apps/hwloc-1.10.1-r1 b/metadata/md5-cache/sys-apps/hwloc-1.10.1-r1
index efee7971c4de..37359880d24c 100644
--- a/metadata/md5-cache/sys-apps/hwloc-1.10.1-r1
+++ b/metadata/md5-cache/sys-apps/hwloc-1.10.1-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=>=sys-libs/ncurses-5.9-r3[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(-)?] cairo? ( >=x11-libs/cairo-1.12.14-r4[X?,svg?,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(-)?] ) cuda? ( >=dev-util/nvidia-cuda-toolkit-6.5.19-r1 ) gl? ( media-video/nvidia-settings ) opencl? ( x11-drivers/ati-drivers:* ) pci? ( >=sys-apps/pciutils-3.3.0-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(-)?] >=x11-libs/libpciaccess-0.13.1-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(-)?] ) plugins? ( dev-libs/libltdl: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(-)?] ) numa? ( >=sys-process/numactl-2.0.10-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(-)?] ) xml? ( >=dev-libs/libxml2-2.9.1-r4[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/5
 SRC_URI=http://www.open-mpi.org/software/hwloc/v1.10/downloads/hwloc-1.10.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	cuda	2c8df288287b71bc5abbb1ae33869059	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	cuda	2c8df288287b71bc5abbb1ae33869059	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c6e453b5fddd882afd3194aa191903d1
diff --git a/metadata/md5-cache/sys-apps/install-xattr-0.5 b/metadata/md5-cache/sys-apps/install-xattr-0.5
index e9ad839c552f..d8ae55ee9156 100644
--- a/metadata/md5-cache/sys-apps/install-xattr-0.5
+++ b/metadata/md5-cache/sys-apps/install-xattr-0.5
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare test
 DESCRIPTION=Wrapper to coreutil's install to preserve Filesystem Extended Attributes
 EAPI=5
 HOMEPAGE=http://dev.gentoo.org/~blueness/install-xattr/
-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-3
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/install-xattr/install-xattr-0.5.tar.bz2
 _eclasses_=multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=4c9bb5eb26b1e0bc00db56385e7ae32d
+_md5_=dc5f5e1efab762d57ba6112ec16d5422
diff --git a/metadata/md5-cache/sys-apps/keyutils-1.5.9-r1 b/metadata/md5-cache/sys-apps/keyutils-1.5.9-r1
index 1ae83366e5d5..95a858faef9b 100644
--- a/metadata/md5-cache/sys-apps/keyutils-1.5.9-r1
+++ b/metadata/md5-cache/sys-apps/keyutils-1.5.9-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r1 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://people.redhat.com/dhowells/keyutils/keyutils-1.5.9.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c1d621ce415a4281440863bf2a655ffe
diff --git a/metadata/md5-cache/sys-apps/openrc-0.16.4 b/metadata/md5-cache/sys-apps/openrc-0.16.4
index 0402a707fc65..dbe1d67a6824 100644
--- a/metadata/md5-cache/sys-apps/openrc-0.16.4
+++ b/metadata/md5-cache/sys-apps/openrc-0.16.4
@@ -4,11 +4,11 @@ DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
 EAPI=5
 HOMEPAGE=http://www.gentoo.org/proj/en/base/openrc/
 IUSE=audit debug elibc_glibc ncurses pam newnet prefix +netifrc selinux static-libs tools unicode kernel_linux kernel_FreeBSD
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=BSD-2
 PDEPEND=netifrc? ( net-misc/netifrc )
 RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) elibc_glibc? ( >=sys-libs/glibc-2.5 ) ncurses? ( sys-libs/ncurses ) pam? ( sys-auth/pambase virtual/pam ) tools? ( dev-lang/perl ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils sys-libs/libselinux ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( sec-policy/selinux-base-policy sec-policy/selinux-openrc )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~williamh/dist/openrc-0.16.4.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=7966ca827cbae674a1f78de5ad3f7fd7
+_md5_=8770b000271a01d3809f9c1811b9cd63
diff --git a/metadata/md5-cache/sys-apps/pciutils-3.3.0-r2 b/metadata/md5-cache/sys-apps/pciutils-3.3.0-r2
index 71449cdc167b..a67725e76a8c 100644
--- a/metadata/md5-cache/sys-apps/pciutils-3.3.0-r2
+++ b/metadata/md5-cache/sys-apps/pciutils-3.3.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kmod? ( sys-apps/kmod ) static-libs? ( 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(-)?] ) ) !static-libs? ( 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(-)?] ) ) udev? ( >=virtual/libudev-208[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(-)?] ) sys-apps/hwids abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-3.3.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d22c3fb4b7e4ae4a06a87e8cd4d9b1a5
diff --git a/metadata/md5-cache/sys-apps/pciutils-3.3.1 b/metadata/md5-cache/sys-apps/pciutils-3.3.1
index 34792fd292f6..9da9df3b37a1 100644
--- a/metadata/md5-cache/sys-apps/pciutils-3.3.1
+++ b/metadata/md5-cache/sys-apps/pciutils-3.3.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=kmod? ( sys-apps/kmod ) static-libs? ( 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(-)?] ) ) !static-libs? ( 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(-)?] ) ) udev? ( >=virtual/libudev-208[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(-)?] ) sys-apps/hwids abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r14 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-3.3.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2bb74134f550f35922454b48017231a2
diff --git a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.13-r1 b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.13-r1
index 95dca7d0ca0f..ff28e32e6b5b 100644
--- a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.13-r1
+++ b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.13-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets
 REQUIRED_USE=^^ ( udev libusb )
 SLOT=0
 SRC_URI=http://alioth.debian.org/download.php/file/4126/pcsc-lite-1.8.13.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=a087f59b5ea611a5e5e54a6172d64c08
diff --git a/metadata/md5-cache/sys-apps/systemd-216-r3 b/metadata/md5-cache/sys-apps/systemd-216-r3
index 61b4156289eb..441c5957e909 100644
--- a/metadata/md5-cache/sys-apps/systemd-216-r3
+++ b/metadata/md5-cache/sys-apps/systemd-216-r3
@@ -10,5 +10,5 @@ PDEPEND=>=sys-apps/dbus-1.6.8-r1:0[systemd] >=sys-apps/hwids-20130717-r1[udev] >
 RDEPEND=>=sys-apps/util-linux-2.20:0= sys-libs/libcap:0= !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) gudev? ( >=dev-libs/glib-2.34.3:2=[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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) pam? ( virtual/pam:= ) 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(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit >=sys-apps/util-linux-2.24.1-r2 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 || ( >=sys-apps/util-linux-2.22 <sys-apps/sysvinit-2.88-r4 ) !sys-auth/nss-myhostname !sys-fs/udev gudev? ( !dev-libs/libgudev )
 SLOT=0/2
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-216.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=691ed3eed12a4d3038361c037e5d5727
diff --git a/metadata/md5-cache/sys-apps/systemd-218-r3 b/metadata/md5-cache/sys-apps/systemd-218-r3
index 3164b4917f3f..12320aff9d5f 100644
--- a/metadata/md5-cache/sys-apps/systemd-218-r3
+++ b/metadata/md5-cache/sys-apps/systemd-218-r3
@@ -10,5 +10,5 @@ PDEPEND=>=sys-apps/dbus-1.6.8-r1:0[systemd] >=sys-apps/hwids-20130717-r1[udev] >
 RDEPEND=>=sys-apps/util-linux-2.25:0= sys-libs/libcap:0= !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) gudev? ( >=dev-libs/glib-2.34.3:2=[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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) pam? ( virtual/pam:= ) 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(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) terminal? ( >=dev-libs/libevdev-1.2:0= >=x11-libs/libxkbcommon-0.5:0= >=x11-libs/libdrm-2.4:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev gudev? ( !dev-libs/libgudev )
 SLOT=0/2
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-218.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0ea188346fb5e372f3424eb9988c24d7
diff --git a/metadata/md5-cache/sys-apps/systemd-219_p112 b/metadata/md5-cache/sys-apps/systemd-219_p112
index b79c5a0b7407..bd48a35d03ca 100644
--- a/metadata/md5-cache/sys-apps/systemd-219_p112
+++ b/metadata/md5-cache/sys-apps/systemd-219_p112
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.25:0= sys-libs/libcap:0= !<sys-libs/glibc-2.16 a
 REQUIRED_USE=importd? ( curl gcrypt lzma )
 SLOT=0/2
 SRC_URI=http://dev.gentoo.org/~floppym/dist/systemd-219_p112.tar.xz http://cgit.freedesktop.org/systemd/systemd/plain/tmpfiles.d/systemd.conf.m4?id=v219 -> systemd.conf.m4-v219
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1026476315c08eae05ed654e2807423a
diff --git a/metadata/md5-cache/sys-apps/systemd-220-r2 b/metadata/md5-cache/sys-apps/systemd-220-r2
index d9e573ab94b2..99edeee9961b 100644
--- a/metadata/md5-cache/sys-apps/systemd-220-r2
+++ b/metadata/md5-cache/sys-apps/systemd-220-r2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.25:0= sys-libs/libcap:0= !<sys-libs/glibc-2.16 a
 REQUIRED_USE=importd? ( curl gcrypt lzma )
 SLOT=0/2
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-220.tar.xz http://dev.gentoo.org/~floppym/dist/systemd-220-src-boot-efi.tar.xz http://dev.gentoo.org/~floppym/dist/systemd-220-gentoo-r2.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0bf2a7bb9719b88d14764cad9bd61ba7
diff --git a/metadata/md5-cache/sys-apps/systemd-221 b/metadata/md5-cache/sys-apps/systemd-221
new file mode 100644
index 000000000000..453ac1a79e9d
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-221
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test
+DEPEND=>=sys-apps/util-linux-2.26:0= sys-libs/libcap:0= !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:= ) 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(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) terminal? ( >=dev-libs/libevdev-1.2:0= >=x11-libs/libxkbcommon-0.5:0= >=x11-libs/libdrm-2.4:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-3.8 ia64? ( >=sys-kernel/linux-headers-3.9 ) virtual/pkgconfig gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) python? ( dev-python/lxml[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(+)?] ) terminal? ( media-fonts/unifont[utils(+)] ) test? ( >=sys-apps/dbus-1.6.8-r1:0 ) virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=System and service manager for Linux
+EAPI=5
+HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl apparmor audit cryptsetup curl elfutils gcrypt gnuefi http idn importd +kdbus +kmod +lz4 lzma nat pam policykit python qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb 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 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 ~arm ~ia64 ~x86
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.6.8-r1:0[systemd] >=sys-apps/hwids-20130717-r1[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.26:0= sys-libs/libcap:0= !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:= ) 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(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) terminal? ( >=dev-libs/libevdev-1.2:0= >=x11-libs/libxkbcommon-0.5:0= >=x11-libs/libdrm-2.4:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
+REQUIRED_USE=importd? ( curl gcrypt lzma ) python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) 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/2
+SRC_URI=http://www.freedesktop.org/software/systemd/systemd-221.tar.xz
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=95fb26f81b16644dfbada8590bb0b8c2
diff --git a/metadata/md5-cache/sys-apps/systemd-9999 b/metadata/md5-cache/sys-apps/systemd-9999
index c0ee5bc8794f..7fcfe5790c1c 100644
--- a/metadata/md5-cache/sys-apps/systemd-9999
+++ b/metadata/md5-cache/sys-apps/systemd-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.26:0= sys-libs/libcap:0= !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:= ) 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(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) terminal? ( >=dev-libs/libevdev-1.2:0= >=x11-libs/libxkbcommon-0.5:0= >=x11-libs/libdrm-2.4:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-3.8 ia64? ( >=sys-kernel/linux-headers-3.9 ) virtual/pkgconfig gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) python? ( dev-python/lxml[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(+)?] ) terminal? ( media-fonts/unifont[utils(+)] ) test? ( >=sys-apps/dbus-1.6.8-r1:0 ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 >=dev-libs/libgcrypt-1.4.5:0 >=dev-vcs/git-1.8.2.1 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DEPEND=>=sys-apps/util-linux-2.26:0= sys-libs/libcap:0= !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:= ) 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(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) terminal? ( >=dev-libs/libevdev-1.2:0= >=x11-libs/libxkbcommon-0.5:0= >=x11-libs/libdrm-2.4:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 >=sys-devel/binutils-2.23.1 >=sys-devel/gcc-4.6 >=sys-kernel/linux-headers-3.8 ia64? ( >=sys-kernel/linux-headers-3.9 ) virtual/pkgconfig gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) python? ( dev-python/lxml[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(+)?] ) terminal? ( media-fonts/unifont[utils(+)] ) test? ( >=sys-apps/dbus-1.6.8-r1:0 ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 >=dev-libs/libgcrypt-1.4.5: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_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(+)?] >=dev-vcs/git-1.8.2.1 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
 DESCRIPTION=System and service manager for Linux
 EAPI=5
 HOMEPAGE=http://www.freedesktop.org/wiki/Software/systemd
@@ -7,7 +7,7 @@ IUSE=acl apparmor audit cryptsetup curl elfutils gcrypt gnuefi http idn importd
 LICENSE=GPL-2 LGPL-2.1 MIT public-domain
 PDEPEND=>=sys-apps/dbus-1.6.8-r1:0[systemd] >=sys-apps/hwids-20130717-r1[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
 RDEPEND=>=sys-apps/util-linux-2.26:0= sys-libs/libcap:0= !<sys-libs/glibc-2.16 acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5: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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( net-dns/libidn:0= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p119: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:= ) 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(+)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( sys-libs/libseccomp:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/systemd-sysv-utils !sys-apps/sysvinit ) terminal? ( >=dev-libs/libevdev-1.2:0= >=x11-libs/libxkbcommon-0.5:0= >=x11-libs/libdrm-2.4:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
-REQUIRED_USE=importd? ( curl gcrypt lzma )
+REQUIRED_USE=importd? ( curl gcrypt lzma ) python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) 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 ) ) ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) 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/2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=1d199f729dd0ff38e49b8c1ca092b16c
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=347260ad27f272c7aa1d1a92ca7c5eb5
diff --git a/metadata/md5-cache/sys-apps/tcp-wrappers-7.6.22-r1 b/metadata/md5-cache/sys-apps/tcp-wrappers-7.6.22-r1
index 8957411ae274..b7510943f96a 100644
--- a/metadata/md5-cache/sys-apps/tcp-wrappers-7.6.22-r1
+++ b/metadata/md5-cache/sys-apps/tcp-wrappers-7.6.22-r1
@@ -8,5 +8,5 @@ LICENSE=tcp_wrappers_license
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=ftp://ftp.porcupine.org/pub/security/tcp_wrappers_7.6.tar.gz mirror://debian/pool/main/t/tcp-wrappers/tcp-wrappers_7.6.q-22.debian.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2f04bca128b617141281ac0b27455a7f
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.24.1-r3 b/metadata/md5-cache/sys-apps/util-linux-2.24.1-r3
index e4ecfce5744a..0a7703a4b2ee 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.24.1-r3
+++ b/metadata/md5-cache/sys-apps/util-linux-2.24.1-r3
@@ -10,5 +10,5 @@ RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !s
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) 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=mirror://kernel/linux/utils/util-linux/v2.24/util-linux-2.24.1.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8f1a22ccabbaa5c5d011879cf527fb94
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.24.2 b/metadata/md5-cache/sys-apps/util-linux-2.24.2
index ae57e28d95d2..6f3d480df1cb 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.24.2
+++ b/metadata/md5-cache/sys-apps/util-linux-2.24.2
@@ -10,5 +10,5 @@ RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !s
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) 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=mirror://kernel/linux/utils/util-linux/v2.24/util-linux-2.24.2.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=3285b99c6b27023aff6e4f33f7038476
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.25.1 b/metadata/md5-cache/sys-apps/util-linux-2.25.1
index bd7f4feb8c16..75b3ae36820b 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.25.1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.25.1
@@ -10,5 +10,5 @@ RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !s
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) 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=mirror://kernel/linux/utils/util-linux/v2.25/util-linux-2.25.1.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=391faa37425b8fbefa3943dd7bd97898
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.25.1-r1 b/metadata/md5-cache/sys-apps/util-linux-2.25.1-r1
index f409fafa45ae..f5c305ac9fad 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.25.1-r1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.25.1-r1
@@ -10,5 +10,5 @@ RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !s
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) 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=mirror://kernel/linux/utils/util-linux/v2.25/util-linux-2.25.1.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f42952cb67b9b41a143b903243612bf4
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.25.2 b/metadata/md5-cache/sys-apps/util-linux-2.25.2
index 4a1ce1461f62..5e2408ae394a 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.25.2
+++ b/metadata/md5-cache/sys-apps/util-linux-2.25.2
@@ -10,5 +10,5 @@ RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !s
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) 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=mirror://kernel/linux/utils/util-linux/v2.25/util-linux-2.25.2.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=bc8671b39d81e291fba05b388d054a9e
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.25.2-r1 b/metadata/md5-cache/sys-apps/util-linux-2.25.2-r1
index f0c6b5b49495..f988f2660932 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.25.2-r1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.25.2-r1
@@ -10,5 +10,5 @@ RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !s
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) 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=mirror://kernel/linux/utils/util-linux/v2.25/util-linux-2.25.2.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=13e20a16e5c8694f742821fe8208fb9f
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.25.2-r2 b/metadata/md5-cache/sys-apps/util-linux-2.25.2-r2
index 82eecd97dfa0..f6298c3a26b1 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.25.2-r2
+++ b/metadata/md5-cache/sys-apps/util-linux-2.25.2-r2
@@ -10,5 +10,5 @@ RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !s
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) 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=mirror://kernel/linux/utils/util-linux/v2.25/util-linux-2.25.2.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b5419fb0542f106da1ba143497c1aa29
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.26 b/metadata/md5-cache/sys-apps/util-linux-2.26
index c2c5bca3ba7c..8187cef59835 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.26
+++ b/metadata/md5-cache/sys-apps/util-linux-2.26
@@ -10,5 +10,5 @@ RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !s
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) 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=mirror://kernel/linux/utils/util-linux/v2.26/util-linux-2.26.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=10b51b3865711f3ca6e46bf8221a6477
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.26.1 b/metadata/md5-cache/sys-apps/util-linux-2.26.1
index a9933f72f41b..35e48c60d89d 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.26.1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.26.1
@@ -10,5 +10,5 @@ RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !s
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) 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=mirror://kernel/linux/utils/util-linux/v2.26/util-linux-2.26.1.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1408dc128dcdacfa6adab6bde780b403
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.26.1-r1 b/metadata/md5-cache/sys-apps/util-linux-2.26.1-r1
index 87ed18dab267..99d6d3d6ed38 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.26.1-r1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.26.1-r1
@@ -10,5 +10,5 @@ RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !s
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) 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=mirror://kernel/linux/utils/util-linux/v2.26/util-linux-2.26.1.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=aca750f940fb60b6d604062029e4e974
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.26.2 b/metadata/md5-cache/sys-apps/util-linux-2.26.2
index 67a49642f7e2..443b7dd13ec1 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.26.2
+++ b/metadata/md5-cache/sys-apps/util-linux-2.26.2
@@ -10,5 +10,5 @@ RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !s
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) 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=mirror://kernel/linux/utils/util-linux/v2.26/util-linux-2.26.2.tar.xz
-_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f8be906f026060a5bfd4483cfac85a25
diff --git a/metadata/md5-cache/sys-apps/util-linux-9999 b/metadata/md5-cache/sys-apps/util-linux-9999
index c4c061d10bbf..22bb509dffc9 100644
--- a/metadata/md5-cache/sys-apps/util-linux-9999
+++ b/metadata/md5-cache/sys-apps/util-linux-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
 RDEPEND=!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-1.3-r2 caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2 ) pam? ( sys-libs/pam ) 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(+)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[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(-)?] ) slang? ( sys-libs/slang ) systemd? ( sys-apps/systemd ) udev? ( virtual/libudev ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_3 python_single_target_python3_4 python_single_target_python2_7 ) 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
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=531380dd45ba95fc284f94628d0b07de
diff --git a/metadata/md5-cache/sys-auth/nss-mdns-0.10-r2 b/metadata/md5-cache/sys-auth/nss-mdns-0.10-r2
index 2eaaf255a985..bc3dfd53b13a 100644
--- a/metadata/md5-cache/sys-auth/nss-mdns-0.10-r2
+++ b/metadata/md5-cache/sys-auth/nss-mdns-0.10-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-dns/avahi-0.6.31-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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.10.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b4848040eb0ca67c10e837afe5239e9b
diff --git a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.8.14-r2 b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.8.14-r2
index a11f3ad6d65c..ebbe91c60959 100644
--- a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.8.14-r2
+++ b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.8.14-r2
@@ -4,10 +4,10 @@ DESCRIPTION=NSS module for name lookups using LDAP
 EAPI=5
 HOMEPAGE=http://arthurdejong.org/nss-pam-ldapd/
 IUSE=debug kerberos sasl +pam 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=~x86 ~amd64
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=net-nds/openldap sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) pam? ( virtual/pam ) !sys-auth/nss_ldap !sys-auth/pam_ldap
 SLOT=0
 SRC_URI=http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.8.14.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
-_md5_=e9e9fbffb72173c733e0c58fb19769e9
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_md5_=db61cda88bedc70e6c7942041b4bab74
diff --git a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.6 b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.6
index 232b3db2da51..2aa36700fc47 100644
--- a/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.6
+++ b/metadata/md5-cache/sys-auth/nss-pam-ldapd-0.9.6
@@ -9,5 +9,5 @@ RDEPEND=net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_
 REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) )
 SLOT=0
 SRC_URI=http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	s6	274e4dec773e1303b2552f2b0b0e52aa	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	s6	274e4dec773e1303b2552f2b0b0e52aa	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747
 _md5_=6709202bb40b1a7b9724c9a49a7ffe3a
diff --git a/metadata/md5-cache/sys-auth/nss_ldap-265-r5 b/metadata/md5-cache/sys-auth/nss_ldap-265-r5
index 9ceb850fda14..4fa2f05d9a40 100644
--- a/metadata/md5-cache/sys-auth/nss_ldap-265-r5
+++ b/metadata/md5-cache/sys-auth/nss_ldap-265-r5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=net-nds/openldap-2.4.38-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(-)?] sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r3[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? ( >=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(-)?] ) ssl? ( >=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(-)?] ) !<net-fs/autofs-4.1.3 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.padl.com/download/nss_ldap-265.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fixheadtails	c6fd1fc49c9dc11924f28a1406f251a0	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0e6fad199d67b692f8bfab034be87bac
diff --git a/metadata/md5-cache/sys-auth/openpam-20140912 b/metadata/md5-cache/sys-auth/openpam-20140912
index ae60eba68111..f10fc82190ae 100644
--- a/metadata/md5-cache/sys-auth/openpam-20140912
+++ b/metadata/md5-cache/sys-auth/openpam-20140912
@@ -10,5 +10,5 @@ PDEPEND=sys-auth/pambase vim-syntax? ( app-vim/pam-syntax )
 RDEPEND=!sys-libs/pam
 SLOT=0
 SRC_URI=mirror://sourceforge/openpam/openpam-20140912.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=543229c7994d6616f95ed5bdcc294160
diff --git a/metadata/md5-cache/sys-auth/pam_ldap-186-r1 b/metadata/md5-cache/sys-auth/pam_ldap-186-r1
index d97eb2e7933d..f96b6912359f 100644
--- a/metadata/md5-cache/sys-auth/pam_ldap-186-r1
+++ b/metadata/md5-cache/sys-auth/pam_ldap-186-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 LGPL-2 )
 RDEPEND=|| ( >=sys-libs/glibc-2.1.3 >=sys-freebsd/freebsd-lib-9.1 ) >=virtual/pam-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(-)?] >=net-nds/openldap-2.4.38-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(-)?] sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r3[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-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.padl.com/download/pam_ldap-186.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=505ff8f6361e3d218eade559b4b57e65
diff --git a/metadata/md5-cache/sys-auth/sssd-1.12.4 b/metadata/md5-cache/sys-auth/sssd-1.12.4
index f8278fa60483..3af2c3ce216d 100644
--- a/metadata/md5-cache/sys-auth/sssd-1.12.4
+++ b/metadata/md5-cache/sys-auth/sssd-1.12.4
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/pam-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(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 locator? ( >=app-crypt/mit-krb5-1.12.2[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(-)?] >=net-dns/c-ares-1.10.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(-)?] ) >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) augeas? ( app-admin/augeas ) nfsv4? ( net-libs/libnfsidmap ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.0 ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
 SLOT=0
 SRC_URI=http://fedorahosted.org/released/sssd/sssd-1.12.4.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=57e78ef72ded3a69e31eec1a4e1029dc
diff --git a/metadata/md5-cache/sys-auth/sssd-1.12.5 b/metadata/md5-cache/sys-auth/sssd-1.12.5
index 6d236848d321..64fc09ddc57c 100644
--- a/metadata/md5-cache/sys-auth/sssd-1.12.5
+++ b/metadata/md5-cache/sys-auth/sssd-1.12.5
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=virtual/pam-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(-)?] >=dev-libs/popt-1.16 dev-libs/glib:2 >=dev-libs/ding-libs-0.2 >=sys-libs/talloc-2.0.7 >=sys-libs/tdb-1.2.9 >=sys-libs/tevent-0.9.16 >=sys-libs/ldb-1.1.17-r1:= >=net-nds/openldap-2.4.30[sasl] >=dev-libs/libpcre-8.30 >=app-crypt/mit-krb5-1.10.3 locator? ( >=app-crypt/mit-krb5-1.12.2[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(-)?] >=net-dns/c-ares-1.10.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(-)?] ) >=sys-apps/keyutils-1.5 >=net-dns/c-ares-1.7.4 >=dev-libs/nss-3.12.9 selinux? ( >=sys-libs/libselinux-2.1.9 >=sys-libs/libsemanage-2.1 ) >=net-dns/bind-tools-9.9[gssapi] >=dev-libs/cyrus-sasl-2.1.25-r3[kerberos] >=sys-apps/dbus-1.6 acl? ( net-fs/cifs-utils[acl] ) augeas? ( app-admin/augeas ) nfsv4? ( net-libs/libnfsidmap ) nls? ( >=sys-devel/gettext-0.18 ) virtual/libintl netlink? ( dev-libs/libnl:3 ) samba? ( >=net-fs/samba-4.0 ) >=sys-libs/glibc-2.17[nscd] selinux? ( >=sec-policy/selinux-sssd-2.20120725-r9 )
 SLOT=0
 SRC_URI=http://fedorahosted.org/released/sssd/sssd-1.12.5.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9d80953af0822818cc3eabd4bae0a5b9
diff --git a/metadata/md5-cache/sys-block/btrace-1.0.3 b/metadata/md5-cache/sys-block/btrace-1.0.3
index 92e4bd59e5cd..8da02122db17 100644
--- a/metadata/md5-cache/sys-block/btrace-1.0.3
+++ b/metadata/md5-cache/sys-block/btrace-1.0.3
@@ -4,9 +4,9 @@ DESCRIPTION=btrace can show detailed info about what is happening on a block dev
 EAPI=2
 HOMEPAGE=http://www.kernel.org/pub/linux/kernel/people/axboe/blktrace/
 IUSE=doc
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://brick.kernel.dk/snaps/blktrace-1.0.3.tar.bz2
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=7f5b54b7252a6bc67cc3aab015365827
+_md5_=a01cf37abb29d95e0d937cb0b3d03302
diff --git a/metadata/md5-cache/sys-block/partitionmanager-1.2.1 b/metadata/md5-cache/sys-block/partitionmanager-1.2.1
index b905cb7f348b..c3f1d7bd33d3 100644
--- a/metadata/md5-cache/sys-block/partitionmanager-1.2.1
+++ b/metadata/md5-cache/sys-block/partitionmanager-1.2.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kcrash-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kjobwidgets-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.10.0:5 handbook? ( >=kde-frameworks/kdoctools-5.10.0:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kcrash-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kjobwidgets-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=kde-frameworks/extra-cmake-modules-5.11.0:5 handbook? ( >=kde-frameworks/kdoctools-5.11.0:5 ) >=dev-qt/qtcore-5.4.1:5 dev-util/desktop-file-utils app-arch/xz-utils
 DESCRIPTION=KDE utility for management of partitions and file systems
 EAPI=5
 HOMEPAGE=https://www.kde.org/applications/system/kdepartitionmanager
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/kconfig-5.10.0:5 >=kde-frameworks/kconfigwidgets-5.10.0:5 >=kde-frameworks/kcoreaddons-5.10.0:5 >=kde-frameworks/kcrash-5.10.0:5 >=kde-frameworks/ki18n-5.10.0:5 >=kde-frameworks/kiconthemes-5.10.0:5 >=kde-frameworks/kio-5.10.0:5 >=kde-frameworks/kjobwidgets-5.10.0:5 >=kde-frameworks/kservice-5.10.0:5 >=kde-frameworks/kwidgetsaddons-5.10.0:5 >=kde-frameworks/kwindowsystem-5.10.0:5 >=kde-frameworks/kxmlgui-5.10.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/libatasmart sys-apps/util-linux >=sys-block/parted-3 !sys-block/partitionmanager:0 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.11.0:5 >=kde-frameworks/kconfigwidgets-5.11.0:5 >=kde-frameworks/kcoreaddons-5.11.0:5 >=kde-frameworks/kcrash-5.11.0:5 >=kde-frameworks/ki18n-5.11.0:5 >=kde-frameworks/kiconthemes-5.11.0:5 >=kde-frameworks/kio-5.11.0:5 >=kde-frameworks/kjobwidgets-5.11.0:5 >=kde-frameworks/kservice-5.11.0:5 >=kde-frameworks/kwidgetsaddons-5.11.0:5 >=kde-frameworks/kwindowsystem-5.11.0:5 >=kde-frameworks/kxmlgui-5.11.0:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/libatasmart sys-apps/util-linux >=sys-block/parted-3 !sys-block/partitionmanager:0 >=kde-frameworks/kf-env-3 >=dev-qt/qtcore-5.4.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/partitionmanager/1.2.1/src/partitionmanager-1.2.1.tar.xz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	5e633f0138ab82d4555c822daf291497	kde5-functions	55bbd45f36f6ea480772230d6af0be60	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	kde5	a0bfbec14bd8a9837ad3e45e93d1ee16	kde5-functions	8b3c29b0cd51b41938ea9ae2cc3a3722	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=f19507d6356523013eef9439eaad9e8b
diff --git a/metadata/md5-cache/sys-boot/os-prober-1.65 b/metadata/md5-cache/sys-boot/os-prober-1.65
index 490acf369f7d..0595d2ca42ad 100644
--- a/metadata/md5-cache/sys-boot/os-prober-1.65
+++ b/metadata/md5-cache/sys-boot/os-prober-1.65
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install postinst prepare
 DESCRIPTION=Utility to detect other OSs on a set of drives
 EAPI=5
 HOMEPAGE=http://packages.debian.org/source/sid/os-prober
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=mirror://debian/pool/main/o/os-prober/os-prober_1.65.tar.xz
 _eclasses_=multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=6d50e3a81701fb5e0d095b1d2b69f5b4
+_md5_=af37422f58c839be9c9443f784372a00
diff --git a/metadata/md5-cache/sys-devel/clang-3.3-r100 b/metadata/md5-cache/sys-devel/clang-3.3-r100
index e093e66bdecb..fb4517cfda93 100644
--- a/metadata/md5-cache/sys-devel/clang-3.3-r100
+++ b/metadata/md5-cache/sys-devel/clang-3.3-r100
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm ppc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-3.3[clang(-),debug=,multitarget?,python?,static-analyzer,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/3.3
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=744fe0bbdc85cd969aa6d7c59beef1f7
diff --git a/metadata/md5-cache/sys-devel/clang-3.4.2-r100 b/metadata/md5-cache/sys-devel/clang-3.4.2-r100
index 5306b0e2dbdd..0cf10d8fe7a5 100644
--- a/metadata/md5-cache/sys-devel/clang-3.4.2-r100
+++ b/metadata/md5-cache/sys-devel/clang-3.4.2-r100
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-3.4.2[clang(-),debug=,multitarget?,python?,static-analyzer,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/3.4
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=43cba845ac1ff39c40894a3ef0545860
diff --git a/metadata/md5-cache/sys-devel/clang-3.5.0-r100 b/metadata/md5-cache/sys-devel/clang-3.5.0-r100
index cf2d411f2748..d4aee6b75f6a 100644
--- a/metadata/md5-cache/sys-devel/clang-3.5.0-r100
+++ b/metadata/md5-cache/sys-devel/clang-3.5.0-r100
@@ -7,5 +7,5 @@ KEYWORDS=amd64 arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-3.5.0[clang(-),debug=,multitarget?,python?,static-analyzer,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/3.5
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1f02bc8bccc5fe7732195478d40aa3df
diff --git a/metadata/md5-cache/sys-devel/clang-3.5.1-r100 b/metadata/md5-cache/sys-devel/clang-3.5.1-r100
index 88ff939a4b83..fa0a2e5317d6 100644
--- a/metadata/md5-cache/sys-devel/clang-3.5.1-r100
+++ b/metadata/md5-cache/sys-devel/clang-3.5.1-r100
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-3.5.1[clang(-),debug=,multitarget?,python?,static-analyzer,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/3.5
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=02105e5c051742b58648a7935c92a36b
diff --git a/metadata/md5-cache/sys-devel/clang-3.5.2-r100 b/metadata/md5-cache/sys-devel/clang-3.5.2-r100
index 4a62662fb9b5..e4a1daa50756 100644
--- a/metadata/md5-cache/sys-devel/clang-3.5.2-r100
+++ b/metadata/md5-cache/sys-devel/clang-3.5.2-r100
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-3.5.2[clang(-),debug=,multitarget?,python?,static-analyzer,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/3.5
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=289d60473a7d3c707734503d6425f0aa
diff --git a/metadata/md5-cache/sys-devel/clang-3.6.0-r100 b/metadata/md5-cache/sys-devel/clang-3.6.0-r100
index f909792ade7a..a0733bb4620a 100644
--- a/metadata/md5-cache/sys-devel/clang-3.6.0-r100
+++ b/metadata/md5-cache/sys-devel/clang-3.6.0-r100
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-3.6.0[clang(-),debug=,multitarget?,python?,static-analyzer,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/3.6
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7aad12d744cd0f834901e562959b510f
diff --git a/metadata/md5-cache/sys-devel/clang-3.6.1-r100 b/metadata/md5-cache/sys-devel/clang-3.6.1-r100
index c41df36bddbd..3c224d2bcdab 100644
--- a/metadata/md5-cache/sys-devel/clang-3.6.1-r100
+++ b/metadata/md5-cache/sys-devel/clang-3.6.1-r100
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-3.6.1[clang(-),debug=,multitarget?,python?,static-analyzer,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/3.6
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=50c604595418c22baa91f2965bba3612
diff --git a/metadata/md5-cache/sys-devel/clang-9999-r100 b/metadata/md5-cache/sys-devel/clang-9999-r100
index 7a881b011804..412079a6b0a7 100644
--- a/metadata/md5-cache/sys-devel/clang-9999-r100
+++ b/metadata/md5-cache/sys-devel/clang-9999-r100
@@ -6,5 +6,5 @@ IUSE=debug multitarget python +static-analyzer abi_x86_32 abi_x86_64 abi_x86_x32
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-9999[clang(-),debug=,multitarget?,python?,static-analyzer,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/9999
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0f2d51832665020df9f9581535dcabeb
diff --git a/metadata/md5-cache/sys-devel/flex-2.5.39-r1 b/metadata/md5-cache/sys-devel/flex-2.5.39-r1
index 0b9a0133cf85..2d90ba711e18 100644
--- a/metadata/md5-cache/sys-devel/flex-2.5.39-r1
+++ b/metadata/md5-cache/sys-devel/flex-2.5.39-r1
@@ -9,5 +9,5 @@ LICENSE=FLEX
 RDEPEND=sys-devel/m4
 SLOT=0
 SRC_URI=mirror://sourceforge/flex/flex-2.5.39.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8cfc3a2c6f7c56365867299a4a1700e4
diff --git a/metadata/md5-cache/sys-devel/gettext-0.18.3.2 b/metadata/md5-cache/sys-devel/gettext-0.18.3.2
index 2d2f61208b82..51a8a12b85a8 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.18.3.2
+++ b/metadata/md5-cache/sys-devel/gettext-0.18.3.2
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=virtual/libiconv-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(-)?] dev-libs/libxml2 dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses ) java? ( >=virtual/jdk-1.4 ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r11 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.18.3.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b09b5cd2e4034789221924f787b71324
diff --git a/metadata/md5-cache/sys-devel/gettext-0.19.3 b/metadata/md5-cache/sys-devel/gettext-0.19.3
index e96868c77071..c9f0d301fff1 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.19.3
+++ b/metadata/md5-cache/sys-devel/gettext-0.19.3
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=virtual/libiconv-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(-)?] dev-libs/libxml2 dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses ) java? ( >=virtual/jdk-1.4 ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r11 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.19.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f57b54cc7e862a577aa75fcdf5c09ce4
diff --git a/metadata/md5-cache/sys-devel/gettext-0.19.4 b/metadata/md5-cache/sys-devel/gettext-0.19.4
index 9869c0ff0b14..d51d2d73ce37 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.19.4
+++ b/metadata/md5-cache/sys-devel/gettext-0.19.4
@@ -4,11 +4,11 @@ DESCRIPTION=GNU locale utilities
 EAPI=4
 HOMEPAGE=http://www.gnu.org/software/gettext/
 IUSE=acl -cvs doc emacs git java nls +cxx ncurses openmp static-libs elibc_glibc elibc_musl elibc_FreeBSD java 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
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-3 LGPL-2
 PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=virtual/libiconv-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(-)?] dev-libs/libxml2 dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses ) java? ( >=virtual/jdk-1.4 ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r11 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.19.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=52ca95b1d7f1c02768fbfd5044d51f78
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	mono-env	59ca1177366cc9e14521d3501e9bb281	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=ba654dc7d9855e490a51ab1c8a575fd1
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.2-r1 b/metadata/md5-cache/sys-devel/libtool-2.4.2-r1
index 62831856350d..7156c9c6b497 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4.2-r1
+++ b/metadata/md5-cache/sys-devel/libtool-2.4.2-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig !<sys-devel/autoconf-2.62:2.5 !<sys-devel/automake-1.11.1:1.11 !=sys-devel/libtool-2*:1.5 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140406-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.2.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	unpacker	f300a7ca9131b1024a79762e8edd3c52
 _md5_=526f3cbbe1df8c0412727b5f8095651f
diff --git a/metadata/md5-cache/sys-devel/llvm-3.3-r3 b/metadata/md5-cache/sys-devel/llvm-3.3-r3
index da4536cf8469..a34423fc0683 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.3-r3
+++ b/metadata/md5-cache/sys-devel/llvm-3.3-r3
@@ -10,5 +10,5 @@ RDEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_python2_7? ( >=dev-la
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy ) test? ( || ( python_targets_python2_7 ) )
 SLOT=0/3.3
 SRC_URI=http://llvm.org/releases/3.3/llvm-3.3.src.tar.gz clang? ( http://llvm.org/releases/3.3/compiler-rt-3.3.src.tar.gz http://llvm.org/releases/3.3/cfe-3.3.src.tar.gz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.3-manpages.tar.bz2 )
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0dbe5d75a55f01e6778d3f424f12eccb
diff --git a/metadata/md5-cache/sys-devel/llvm-3.4.2 b/metadata/md5-cache/sys-devel/llvm-3.4.2
index 8c2f8238015a..4be9bb079925 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.4.2
+++ b/metadata/md5-cache/sys-devel/llvm-3.4.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_python2_7? ( >=dev-la
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy ) test? ( || ( python_targets_python2_7 ) )
 SLOT=0/3.4
 SRC_URI=http://llvm.org/releases/3.4.2/llvm-3.4.2.src.tar.gz clang? ( http://llvm.org/releases/3.4.2/compiler-rt-3.4.src.tar.gz http://llvm.org/releases/3.4.2/cfe-3.4.2.src.tar.gz http://llvm.org/releases/3.4.2/clang-tools-extra-3.4.src.tar.gz ) !doc? ( http://dev.gentoo.org/~mgorny/dist/llvm-3.4-manpages.tar.bz2 )
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1bb3c35e2fc1059d1854921ce965a663
diff --git a/metadata/md5-cache/sys-devel/llvm-3.5.0 b/metadata/md5-cache/sys-devel/llvm-3.5.0
index 883f7bfb702e..a0517fdc7281 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.5.0
+++ b/metadata/md5-cache/sys-devel/llvm-3.5.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_python2_7? ( >=dev-la
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy ) test? ( || ( python_targets_python2_7 ) )
 SLOT=0/3.5
 SRC_URI=http://llvm.org/releases/3.5.0/llvm-3.5.0.src.tar.xz clang? ( http://llvm.org/releases/3.5.0/compiler-rt-3.5.0.src.tar.xz http://llvm.org/releases/3.5.0/cfe-3.5.0.src.tar.xz http://llvm.org/releases/3.5.0/clang-tools-extra-3.5.0.src.tar.xz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.5.0-manpages.tar.bz2 )
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a3dc7f90027b598b62fe14c8e311ce24
diff --git a/metadata/md5-cache/sys-devel/llvm-3.5.1 b/metadata/md5-cache/sys-devel/llvm-3.5.1
index 2022dba3c967..a7ce5bdc7b6c 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.5.1
+++ b/metadata/md5-cache/sys-devel/llvm-3.5.1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_python2_7? ( >=dev-la
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy ) test? ( || ( python_targets_python2_7 ) )
 SLOT=0/3.5
 SRC_URI=http://llvm.org/releases/3.5.1/llvm-3.5.1.src.tar.xz clang? ( http://llvm.org/releases/3.5.1/compiler-rt-3.5.1.src.tar.xz http://llvm.org/releases/3.5.1/cfe-3.5.1.src.tar.xz http://llvm.org/releases/3.5.1/clang-tools-extra-3.5.1.src.tar.xz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.5.0-manpages.tar.bz2 )
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d26e8c993b2d5f0eb61f498bd6bd068b
diff --git a/metadata/md5-cache/sys-devel/llvm-3.5.2 b/metadata/md5-cache/sys-devel/llvm-3.5.2
index b2e67377f2e6..ab972523dc23 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.5.2
+++ b/metadata/md5-cache/sys-devel/llvm-3.5.2
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_python2_7? ( >=dev-la
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy ) test? ( || ( python_targets_python2_7 ) )
 SLOT=0/3.5
 SRC_URI=http://llvm.org/releases/3.5.2/llvm-3.5.2.src.tar.xz clang? ( http://llvm.org/releases/3.5.2/compiler-rt-3.5.2.src.tar.xz http://llvm.org/releases/3.5.2/cfe-3.5.2.src.tar.xz http://llvm.org/releases/3.5.2/clang-tools-extra-3.5.2.src.tar.xz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.5.0-manpages.tar.bz2 )
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=fc150b2fc36fb9d0241d963dcd2edd1f
diff --git a/metadata/md5-cache/sys-devel/llvm-3.6.0 b/metadata/md5-cache/sys-devel/llvm-3.6.0
index b83ec5f6eef1..e8b6c0565f4a 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.6.0
+++ b/metadata/md5-cache/sys-devel/llvm-3.6.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_python2_7? ( >=dev-la
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy ) test? ( || ( python_targets_python2_7 ) )
 SLOT=0/3.6
 SRC_URI=http://llvm.org/releases/3.6.0/llvm-3.6.0.src.tar.xz clang? ( http://llvm.org/releases/3.6.0/compiler-rt-3.6.0.src.tar.xz http://llvm.org/releases/3.6.0/cfe-3.6.0.src.tar.xz http://llvm.org/releases/3.6.0/clang-tools-extra-3.6.0.src.tar.xz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.6.0-manpages.tar.bz2 )
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=57626f89e674fb991ba749dd21661268
diff --git a/metadata/md5-cache/sys-devel/llvm-3.6.1 b/metadata/md5-cache/sys-devel/llvm-3.6.1
index 3b2f625ced94..2de56ad3332d 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.6.1
+++ b/metadata/md5-cache/sys-devel/llvm-3.6.1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_python2_7? ( >=dev-la
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy ) test? ( || ( python_targets_python2_7 ) )
 SLOT=0/3.6
 SRC_URI=http://llvm.org/releases/3.6.1/llvm-3.6.1.src.tar.xz clang? ( http://llvm.org/releases/3.6.1/compiler-rt-3.6.1.src.tar.xz http://llvm.org/releases/3.6.1/cfe-3.6.1.src.tar.xz http://llvm.org/releases/3.6.1/clang-tools-extra-3.6.1.src.tar.xz ) !doc? ( http://dev.gentoo.org/~voyageur/distfiles/llvm-3.6.1-manpages.tar.bz2 )
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	prefix	21058c21ca48453d771df15500873ede	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0d2c47593e92b3e90d28d408d3937fc3
diff --git a/metadata/md5-cache/sys-devel/llvm-9999 b/metadata/md5-cache/sys-devel/llvm-9999
index 7d6cd35b862c..f8ab53c6385c 100644
--- a/metadata/md5-cache/sys-devel/llvm-9999
+++ b/metadata/md5-cache/sys-devel/llvm-9999
@@ -9,5 +9,5 @@ PDEPEND=clang? ( =sys-devel/clang-9999-r100 )
 RDEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] ) static-analyzer? ( dev-lang/perl:* python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_pypy? ( virtual/pypy:0= ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_pypy(-)?,-python_single_target_python2_7(-),-python_single_target_pypy(-)] ) xml? ( dev-libs/libxml2:2= ) ) gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit: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(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1: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(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:5=[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(-)?] ) ocaml? ( dev-lang/ocaml:0= dev-ml/findlib dev-ml/ocaml-ctypes ) clang? ( !<=sys-devel/clang-9999-r99 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_pypy ) lldb? ( clang ) test? ( || ( python_targets_python2_7 ) )
 SLOT=0/9999
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pax-utils	dfe060cb70d89757fde5c1ff8405e950	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=bd3e1131f915016f4f892892cda093f3
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-lib-10.1 b/metadata/md5-cache/sys-freebsd/freebsd-lib-10.1
index fac6cdf85776..ff9689bafb71 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-lib-10.1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-lib-10.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ssl? ( dev-libs/openssl ) hesiod? ( net-dns/hesiod ) kerberos? ( app-crypt/heimdal ) usb? ( !dev-libs/libusb ) zfs? ( =sys-freebsd/freebsd-cddl-10.1* ) >=dev-libs/expat-2.0.1 =sys-freebsd/freebsd-libexec-10.1* !sys-libs/libutempter !dev-libs/libelf !dev-libs/libexecinfo !dev-libs/libiconv !sys-freebsd/freebsd-headers =sys-freebsd/freebsd-share-10.1* >=virtual/libiconv-0-r2
 SLOT=0
 SRC_URI=mirror://freebsd/releases/i386/10.1-RELEASE/src.txz -> freebsd-src-10.1.tar.xz https://security.freebsd.org/patches/SA-14:27/stdio.patch -> freebsd-lib-SA-1427-stdio.patch
-_eclasses_=bsdmk	a5323161d86b178920afb5e31a9e5d3f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	freebsd	35f498d509155233569460a87c40fdda	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=bsdmk	a5323161d86b178920afb5e31a9e5d3f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	freebsd	35f498d509155233569460a87c40fdda	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cd5edd8debbe0b52039ffecb102c773b
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11 b/metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11
index 5d97a82367d7..01033e3ad4de 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11
+++ b/metadata/md5-cache/sys-freebsd/freebsd-lib-9.1-r11
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=ssl? ( dev-libs/openssl ) hesiod? ( net-dns/hesiod ) kerberos? ( app-crypt/heimdal ) usb? ( !dev-libs/libusb ) zfs? ( =sys-freebsd/freebsd-cddl-9.1* ) >=dev-libs/expat-2.0.1 !sys-libs/libutempter !sys-freebsd/freebsd-headers
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-lib-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2 mirror://gentoo/freebsd-crypto-9.1.tar.bz2 mirror://gentoo/freebsd-libexec-9.1.tar.bz2 mirror://gentoo/freebsd-etc-9.1.tar.bz2 mirror://gentoo/freebsd-include-9.1.tar.bz2 mirror://gentoo/freebsd-usbin-9.1.tar.bz2 mirror://gentoo/freebsd-gnu-9.1.tar.bz2 build? ( mirror://gentoo/freebsd-sys-9.1.tar.bz2 ) zfs? ( mirror://gentoo/freebsd-cddl-9.1.tar.bz2 )
-_eclasses_=bsdmk	a5323161d86b178920afb5e31a9e5d3f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	freebsd	35f498d509155233569460a87c40fdda	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=bsdmk	a5323161d86b178920afb5e31a9e5d3f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	freebsd	35f498d509155233569460a87c40fdda	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=382749d85f1ed6d0c816d75d75e88aa2
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-libexec-10.1 b/metadata/md5-cache/sys-freebsd/freebsd-libexec-10.1
index 9ec4b7e42285..17c521a73f3b 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-libexec-10.1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-libexec-10.1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-10.1* >=sys-freebsd/freebsd-lib-9.1-r11[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(-)?] pam? ( virtual/pam ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=mirror://freebsd/releases/i386/10.1-RELEASE/src.txz -> freebsd-src-10.1.tar.xz
-_eclasses_=bsdmk	a5323161d86b178920afb5e31a9e5d3f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	freebsd	35f498d509155233569460a87c40fdda	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=bsdmk	a5323161d86b178920afb5e31a9e5d3f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	freebsd	35f498d509155233569460a87c40fdda	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=98d33e4d2e08ddd664e33e3a819d987c
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-libexec-9.1-r2 b/metadata/md5-cache/sys-freebsd/freebsd-libexec-9.1-r2
index 09ac87913c2a..a5b6c0df4549 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-libexec-9.1-r2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-libexec-9.1-r2
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND==sys-freebsd/freebsd-lib-9.1* >=sys-freebsd/freebsd-lib-9.1-r11[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(-)?] pam? ( virtual/pam ) xinetd? ( sys-apps/xinetd )
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-libexec-9.1.tar.bz2 mirror://gentoo/freebsd-ubin-9.1.tar.bz2 mirror://gentoo/freebsd-bin-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2 mirror://gentoo/freebsd-lib-9.1.tar.bz2 mirror://gentoo/freebsd-etc-9.1.tar.bz2 mirror://gentoo/freebsd-usbin-9.1.tar.bz2
-_eclasses_=bsdmk	a5323161d86b178920afb5e31a9e5d3f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	freebsd	35f498d509155233569460a87c40fdda	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=bsdmk	a5323161d86b178920afb5e31a9e5d3f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	freebsd	35f498d509155233569460a87c40fdda	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a5b81dbb32361cd8b7089da9db906078
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-ubin-10.1 b/metadata/md5-cache/sys-freebsd/freebsd-ubin-10.1
index cf16b65327ee..c4803fded245 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-ubin-10.1
+++ b/metadata/md5-cache/sys-freebsd/freebsd-ubin-10.1
@@ -9,5 +9,5 @@ LICENSE=BSD zfs? ( CDDL )
 RDEPEND==sys-freebsd/freebsd-lib-10.1*[usb?,bluetooth?,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(-)?] ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) ar? ( >=app-arch/libarchive-3 ) virtual/pam sys-libs/zlib >=sys-libs/ncurses-5.9 !sys-process/fuser-bsd !dev-util/csup !dev-libs/libiconv !sys-freebsd/freebsd-contrib >=sys-auth/pambase-20080219.1 sys-process/cronbase
 SLOT=0
 SRC_URI=mirror://freebsd/releases/i386/10.1-RELEASE/src.txz -> freebsd-src-10.1.tar.xz
-_eclasses_=bsdmk	a5323161d86b178920afb5e31a9e5d3f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	freebsd	35f498d509155233569460a87c40fdda	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=bsdmk	a5323161d86b178920afb5e31a9e5d3f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	freebsd	35f498d509155233569460a87c40fdda	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=95e2995d3b60af7578f1c4e636f758ca
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r2 b/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r2
index a48d5620c44c..e2e9d4aeeebb 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r2
+++ b/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r2
@@ -9,5 +9,5 @@ LICENSE=BSD zfs? ( CDDL )
 RDEPEND==sys-freebsd/freebsd-lib-9.1*[usb?,bluetooth?,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(-)?] ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) ar? ( >=app-arch/libarchive-3 ) virtual/pam sys-libs/zlib >=sys-libs/ncurses-5.9 !sys-process/fuser-bsd !dev-util/csup >=sys-auth/pambase-20080219.1 sys-process/cronbase
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-ubin-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2 mirror://gentoo/freebsd-lib-9.1.tar.bz2 mirror://gentoo/freebsd-etc-9.1.tar.bz2 mirror://gentoo/freebsd-bin-9.1.tar.bz2 mirror://gentoo/freebsd-include-9.1.tar.bz2 zfs? ( mirror://gentoo/freebsd-cddl-9.1.tar.bz2 ) build? ( mirror://gentoo/freebsd-sys-9.1.tar.bz2 )
-_eclasses_=bsdmk	a5323161d86b178920afb5e31a9e5d3f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	freebsd	35f498d509155233569460a87c40fdda	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=bsdmk	a5323161d86b178920afb5e31a9e5d3f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	freebsd	35f498d509155233569460a87c40fdda	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fe4dad5f85b4f369c47b4b4c23d6545a
diff --git a/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r3 b/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r3
index d8b7e529f05a..7c73878e342e 100644
--- a/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r3
+++ b/metadata/md5-cache/sys-freebsd/freebsd-ubin-9.1-r3
@@ -9,5 +9,5 @@ LICENSE=BSD zfs? ( CDDL )
 RDEPEND==sys-freebsd/freebsd-lib-9.1*[usb?,bluetooth?,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(-)?] ssl? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) ar? ( >=app-arch/libarchive-3 ) virtual/pam sys-libs/zlib >=sys-libs/ncurses-5.9 !sys-process/fuser-bsd !dev-util/csup >=sys-auth/pambase-20080219.1 sys-process/cronbase
 SLOT=0
 SRC_URI=mirror://gentoo/freebsd-ubin-9.1.tar.bz2 mirror://gentoo/freebsd-contrib-9.1.tar.bz2 mirror://gentoo/freebsd-lib-9.1.tar.bz2 mirror://gentoo/freebsd-etc-9.1.tar.bz2 mirror://gentoo/freebsd-bin-9.1.tar.bz2 mirror://gentoo/freebsd-include-9.1.tar.bz2 zfs? ( mirror://gentoo/freebsd-cddl-9.1.tar.bz2 ) build? ( mirror://gentoo/freebsd-sys-9.1.tar.bz2 )
-_eclasses_=bsdmk	a5323161d86b178920afb5e31a9e5d3f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	freebsd	35f498d509155233569460a87c40fdda	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=bsdmk	a5323161d86b178920afb5e31a9e5d3f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	freebsd	35f498d509155233569460a87c40fdda	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=019e7a49b3381233f8db24779f80d5a3
diff --git a/metadata/md5-cache/sys-fs/eudev-1.10-r2 b/metadata/md5-cache/sys-fs/eudev-1.10-r2
index 877da2effa1b..536cfabca751 100644
--- a/metadata/md5-cache/sys-fs/eudev-1.10-r2
+++ b/metadata/md5-cache/sys-fs/eudev-1.10-r2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 gudev? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(
 REQUIRED_USE=keymap? ( hwdb )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/eudev/eudev-1.10.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=85792b1ce4d8e46f24749012e1081e44
diff --git a/metadata/md5-cache/sys-fs/eudev-1.3 b/metadata/md5-cache/sys-fs/eudev-1.3
index 45d6eb36b8a5..076be176d6b9 100644
--- a/metadata/md5-cache/sys-fs/eudev-1.3
+++ b/metadata/md5-cache/sys-fs/eudev-1.3
@@ -11,5 +11,5 @@ RDEPEND=gudev? ( dev-libs/glib:2 ) kmod? ( sys-apps/kmod ) introspection? ( >=de
 REQUIRED_USE=keymap? ( hwdb )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/eudev/eudev-1.3.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5cc6184827aaf194d1496fecdc073a9b
diff --git a/metadata/md5-cache/sys-fs/eudev-1.5.3-r1 b/metadata/md5-cache/sys-fs/eudev-1.5.3-r1
index 255498e8f21b..7781ede48ec4 100644
--- a/metadata/md5-cache/sys-fs/eudev-1.5.3-r1
+++ b/metadata/md5-cache/sys-fs/eudev-1.5.3-r1
@@ -11,5 +11,5 @@ RDEPEND=gudev? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 REQUIRED_USE=keymap? ( hwdb )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/eudev/eudev-1.5.3.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=014833c4e1eb295cfad19bac9509c433
diff --git a/metadata/md5-cache/sys-fs/eudev-1.9-r2 b/metadata/md5-cache/sys-fs/eudev-1.9-r2
index cbb10d57191f..6c63c5a10df6 100644
--- a/metadata/md5-cache/sys-fs/eudev-1.9-r2
+++ b/metadata/md5-cache/sys-fs/eudev-1.9-r2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 gudev? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(
 REQUIRED_USE=keymap? ( hwdb )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/eudev/eudev-1.9.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=61f7e023f5b8769ab5f422a033b08ab5
diff --git a/metadata/md5-cache/sys-fs/eudev-2.1.1 b/metadata/md5-cache/sys-fs/eudev-2.1.1
index e53ec0d6a5f8..5734fec18018 100644
--- a/metadata/md5-cache/sys-fs/eudev-2.1.1
+++ b/metadata/md5-cache/sys-fs/eudev-2.1.1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 gudev? ( >=dev-libs/glib-2.34.3:2[abi_x86_32(
 REQUIRED_USE=keymap? ( hwdb )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/eudev/eudev-2.1.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fd7679a5791e790e735803cd655cb8f2
diff --git a/metadata/md5-cache/sys-fs/eudev-3.0 b/metadata/md5-cache/sys-fs/eudev-3.0
index 627073d6e2df..1142507f2688 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.0
+++ b/metadata/md5-cache/sys-fs/eudev-3.0
@@ -10,5 +10,5 @@ PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
 RDEPEND=>=sys-apps/util-linux-2.20 gudev? ( >=dev-libs/glib-2.34.3:2[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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd gudev? ( !dev-libs/libgudev )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/eudev/eudev-3.0.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=708c4f846cda95a798659584b0271a8d
diff --git a/metadata/md5-cache/sys-fs/eudev-3.1.2 b/metadata/md5-cache/sys-fs/eudev-3.1.2
index 17f5181b9e3c..32c373a2db80 100644
--- a/metadata/md5-cache/sys-fs/eudev-3.1.2
+++ b/metadata/md5-cache/sys-fs/eudev-3.1.2
@@ -10,5 +10,5 @@ PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
 RDEPEND=>=sys-apps/util-linux-2.20 gudev? ( >=dev-libs/glib-2.34.3:2[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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd gudev? ( !dev-libs/libgudev )
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~blueness/eudev/eudev-3.1.2.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7a2a7d14e540ba27951152580ac27407
diff --git a/metadata/md5-cache/sys-fs/eudev-9999 b/metadata/md5-cache/sys-fs/eudev-9999
index b33cdb143ce4..801aace95122 100644
--- a/metadata/md5-cache/sys-fs/eudev-9999
+++ b/metadata/md5-cache/sys-fs/eudev-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-fs/udev-init-scripts-26 hwdb? ( >=sys-apps/hwids-20140304[udev] )
 RDEPEND=>=sys-apps/util-linux-2.20 gudev? ( >=dev-libs/glib-2.34.3:2[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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.38 ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10 !sys-fs/udev !sys-apps/systemd gudev? ( !dev-libs/libgudev )
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0fc6f76430623d840ac9ab376d2af1ec
diff --git a/metadata/md5-cache/sys-fs/fuse-2.9.4 b/metadata/md5-cache/sys-fs/fuse-2.9.4
index afd2e0e448b6..c3986c265e51 100644
--- a/metadata/md5-cache/sys-fs/fuse-2.9.4
+++ b/metadata/md5-cache/sys-fs/fuse-2.9.4
@@ -4,10 +4,10 @@ DESCRIPTION=An interface for filesystems implemented in userspace
 EAPI=5
 HOMEPAGE=http://fuse.sourceforge.net
 IUSE=examples kernel_linux kernel_FreeBSD static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2
 PDEPEND=kernel_FreeBSD? ( sys-fs/fuse4bsd )
 SLOT=0
 SRC_URI=mirror://sourceforge/fuse/fuse-2.9.4.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=fab02d555e54a41091efecdc073f65d0
+_md5_=4a4ea96f276a82aeb80b0a236708b5ff
diff --git a/metadata/md5-cache/sys-fs/libeatmydata-105-r1 b/metadata/md5-cache/sys-fs/libeatmydata-105-r1
index 0f392fe04a04..2336f54d3d2b 100644
--- a/metadata/md5-cache/sys-fs/libeatmydata-105-r1
+++ b/metadata/md5-cache/sys-fs/libeatmydata-105-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/libeatmydata/trunk/release-105/+download/libeatmydata-105.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=813a15ed2f13f8115d1cf382fe247969
diff --git a/metadata/md5-cache/sys-fs/libeatmydata-82-r1 b/metadata/md5-cache/sys-fs/libeatmydata-82-r1
index a65da7173d21..0607bda34de5 100644
--- a/metadata/md5-cache/sys-fs/libeatmydata-82-r1
+++ b/metadata/md5-cache/sys-fs/libeatmydata-82-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://launchpad.net/libeatmydata/trunk/libeatmydata-82/+download/libeatmydata-82.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=58cac677d76c2dc4669b2827de448b24
diff --git a/metadata/md5-cache/sys-fs/udev-208-r1 b/metadata/md5-cache/sys-fs/udev-208-r1
index c8930445059a..3dee0feb445d 100644
--- a/metadata/md5-cache/sys-fs/udev-208-r1
+++ b/metadata/md5-cache/sys-fs/udev-208-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/gli
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-208.tar.xz -> systemd-208-r1.tar.xz http://dev.gentoo.org/~ssuominen/udev-208-patches-1.tar.xz http://dev.gentoo.org/~williamh/dist/udev-208-patches-1.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bbf2828798b4a75770411a83616508b4
diff --git a/metadata/md5-cache/sys-fs/udev-216 b/metadata/md5-cache/sys-fs/udev-216
index 1d3cde0c27f4..9d1e884ab521 100644
--- a/metadata/md5-cache/sys-fs/udev-216
+++ b/metadata/md5-cache/sys-fs/udev-216
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/gli
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-216.tar.xz http://dev.gentoo.org/~ssuominen/udev-216-patches-2.tar.xz http://dev.gentoo.org/~williamh/dist/udev-216-patches-2.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b95ba56e50884b516d2791c2c7daa27b
diff --git a/metadata/md5-cache/sys-fs/udev-217 b/metadata/md5-cache/sys-fs/udev-217
index 83bc9085559f..d33384155014 100644
--- a/metadata/md5-cache/sys-fs/udev-217
+++ b/metadata/md5-cache/sys-fs/udev-217
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/gli
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-217.tar.xz http://dev.gentoo.org/~ssuominen/udev-217-patches-1.tar.xz http://dev.gentoo.org/~williamh/dist/udev-217-patches-1.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=087011ac0c22ed0fe4e4a93fe4640c27
diff --git a/metadata/md5-cache/sys-fs/udev-218 b/metadata/md5-cache/sys-fs/udev-218
index 6a3e65796d7a..6b0bba01778f 100644
--- a/metadata/md5-cache/sys-fs/udev-218
+++ b/metadata/md5-cache/sys-fs/udev-218
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/gli
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-218.tar.xz http://dev.gentoo.org/~ssuominen/udev-218-patches-1.tar.xz http://dev.gentoo.org/~williamh/dist/udev-218-patches-1.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=76045620a8c11d70720737e3a506a116
diff --git a/metadata/md5-cache/sys-fs/udev-219 b/metadata/md5-cache/sys-fs/udev-219
index c8330980099d..dab6e5cf2beb 100644
--- a/metadata/md5-cache/sys-fs/udev-219
+++ b/metadata/md5-cache/sys-fs/udev-219
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/gli
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-219.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3e317052e2975da241003fb80185792b
diff --git a/metadata/md5-cache/sys-fs/udev-220-r1 b/metadata/md5-cache/sys-fs/udev-220-r1
index 59ffdd3c9835..4a2f88403230 100644
--- a/metadata/md5-cache/sys-fs/udev-220-r1
+++ b/metadata/md5-cache/sys-fs/udev-220-r1
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/gli
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-220.tar.xz http://dev.gentoo.org/~ssuominen/udev-220-patches-1.tar.xz http://dev.gentoo.org/~williamh/dist/udev-220-patches-1.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2d2e909de7a0fbbf2d1d622cc2f2e362
diff --git a/metadata/md5-cache/sys-fs/udev-220-r2 b/metadata/md5-cache/sys-fs/udev-220-r2
index 8ed8c0596bfe..4b0569e42311 100644
--- a/metadata/md5-cache/sys-fs/udev-220-r2
+++ b/metadata/md5-cache/sys-fs/udev-220-r2
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/gli
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-220.tar.xz http://dev.gentoo.org/~ssuominen/udev-220-patches-3.tar.xz http://dev.gentoo.org/~williamh/dist/udev-220-patches-3.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bb97c02e2c55b720672eb5fab735b8e3
diff --git a/metadata/md5-cache/sys-fs/udev-220-r3 b/metadata/md5-cache/sys-fs/udev-220-r3
index 01799157d60e..a2b81a24c721 100644
--- a/metadata/md5-cache/sys-fs/udev-220-r3
+++ b/metadata/md5-cache/sys-fs/udev-220-r3
@@ -11,5 +11,5 @@ RDEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) gudev? ( >=dev-libs/gli
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/systemd/systemd-220.tar.xz http://dev.gentoo.org/~ssuominen/udev-220-patches-4.tar.xz http://dev.gentoo.org/~williamh/dist/udev-220-patches-4.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5965440928c157700d3095a0c985ef4a
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index dd9a7320c5db..24d14de30313 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -9,5 +9,5 @@ PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-26
 RDEPEND=>=sys-apps/util-linux-2.20 acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d0063aaf36717f31aa90a7c3c9418daf
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.14.41 b/metadata/md5-cache/sys-kernel/aufs-sources-3.14.41
index 484898a18b40..c64f770ebcb6 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.14.41
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.14.41
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.41
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.14.40+_p20150504.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.14-47.base.tar.xz mirror://gentoo/genpatches-3.14-47.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-47.experimental.tar.xz ) )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7ead52112c39eeb80da5caa1e90d5d94
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.14.42 b/metadata/md5-cache/sys-kernel/aufs-sources-3.14.42
index 8de2735e78da..1d51d27454ca 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.14.42
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.14.42
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.42
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.14.40+_p20150511.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.14-48.base.tar.xz mirror://gentoo/genpatches-3.14-48.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-48.experimental.tar.xz ) )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9a818c954389a000ee250dea855c420f
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.14.43 b/metadata/md5-cache/sys-kernel/aufs-sources-3.14.43
index c50073e2590c..9ade78acddca 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.14.43
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.14.43
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.43
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.14.40+_p20150518.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.14-49.base.tar.xz mirror://gentoo/genpatches-3.14-49.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-49.experimental.tar.xz ) )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=968fcb61e09431faba62277c7e186104
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.14.44 b/metadata/md5-cache/sys-kernel/aufs-sources-3.14.44
index ffbe5f66f3fe..59b16e451a39 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.14.44
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.14.44
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.44
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.14.40+_p20150518.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.14-50.base.tar.xz mirror://gentoo/genpatches-3.14-50.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-50.experimental.tar.xz ) )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0280f4f9947649074fddb20f1db0bbbb
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.18.12 b/metadata/md5-cache/sys-kernel/aufs-sources-3.18.12
index f87c352f3e9e..94a959c57d31 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.18.12
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.18.12
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.18.12
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.18.1+_p20150504.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.18-14.base.tar.xz mirror://gentoo/genpatches-3.18-14.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-14.experimental.tar.xz ) )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7b37a4073bf83794d45fb692403e846f
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.18.13 b/metadata/md5-cache/sys-kernel/aufs-sources-3.18.13
index a7c05a97c081..46fd73e2eaaf 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.18.13
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.18.13
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.18.13
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.18.1+_p20150511.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.18-15.base.tar.xz mirror://gentoo/genpatches-3.18-15.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-15.experimental.tar.xz ) )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4d2642c727ede641b565431d5a896c80
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.18.14 b/metadata/md5-cache/sys-kernel/aufs-sources-3.18.14
index fd2525142499..98275bab9ec9 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.18.14
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.18.14
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.18.14
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.18.1+_p20150518.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.18-16.base.tar.xz mirror://gentoo/genpatches-3.18-16.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-16.experimental.tar.xz ) )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=545f4a595d01ef5232d8eefa2760aca3
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.18.16 b/metadata/md5-cache/sys-kernel/aufs-sources-3.18.16
index 7083e7225c84..ce53840c5173 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.18.16
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.18.16
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.18.16
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.18.1+_p20150622.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.18-17.base.tar.xz mirror://gentoo/genpatches-3.18-17.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-17.experimental.tar.xz ) )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4bded07d1b4c3c324e374aa9b1233d00
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-3.19.8 b/metadata/md5-cache/sys-kernel/aufs-sources-3.19.8
index fa44945bd2ac..52298ebbb0ca 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-3.19.8
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-3.19.8
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.19.8
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.19-gnu/deblob-3.19 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.19-gnu/deblob-check -> deblob-check-3.19 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-3.19_p20150511.tar.xz !vanilla? ( mirror://gentoo/genpatches-3.19-9.base.tar.xz mirror://gentoo/genpatches-3.19-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.19-9.experimental.tar.xz ) )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=507539da5dc198dde69b3aa4741ddaa3
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.0.4 b/metadata/md5-cache/sys-kernel/aufs-sources-4.0.4
index 93c2f505fb6d..905f7a52849e 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.0.4
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.0.4
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.0.4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.0_p20150518.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.0-6.base.tar.xz mirror://gentoo/genpatches-4.0-6.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.0-6.experimental.tar.xz ) )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0195704ae8ba61fde1f85446ce324862
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.0.5 b/metadata/md5-cache/sys-kernel/aufs-sources-4.0.5
index befbbd6e9927..e256cc101771 100644
--- a/metadata/md5-cache/sys-kernel/aufs-sources-4.0.5
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.0.5
@@ -11,5 +11,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.0.5
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) http://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.0_p20150518.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.0-7.base.tar.xz mirror://gentoo/genpatches-4.0-7.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.0-7.experimental.tar.xz ) )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dc491bc260d715fa2b2774a150eb4a63
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.10.77 b/metadata/md5-cache/sys-kernel/ck-sources-3.10.77
index 6edb771e7967..2de9a1a37295 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.10.77
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.10.77
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.77
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-3.10 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-check -> deblob-check-3.10 ) mirror://gentoo/genpatches-3.10-84.base.tar.xz mirror://gentoo/genpatches-3.10-84.extras.tar.xz mirror://gentoo/genpatches-3.10-84.experimental.tar.xz !bfsonly? ( http://dev.gentoo.org/~dlan/distfiles/patch-3.10-ck1-r1.bz2 http://ck.kolivas.org/patches/3.0/3.10/3.10-ck1/patch-3.10-ck1-r1.bz2 ) bfsonly? ( http://dev.gentoo.org/~dlan/distfiles/3.10-sched-bfs-440-r1.patch http://ck.kolivas.org/patches/3.0/3.10/3.10-ck1/patches/3.10-sched-bfs-440-r1.patch )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bf9c30746e987b770ddaddf4cddf493b
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.14.42 b/metadata/md5-cache/sys-kernel/ck-sources-3.14.42
index 98b062440677..b35bcdfad06d 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.14.42
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.14.42
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.42
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) mirror://gentoo/genpatches-3.14-48.base.tar.xz mirror://gentoo/genpatches-3.14-48.extras.tar.xz mirror://gentoo/genpatches-3.14-48.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patch-3.14-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patches/3.14-sched-bfs-447.patch )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f1679b5bf3b5cb2177629d4f2f3c8975
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.14.43 b/metadata/md5-cache/sys-kernel/ck-sources-3.14.43
index 3079db351c94..a8a97fa796dc 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.14.43
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.14.43
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.43
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) mirror://gentoo/genpatches-3.14-49.base.tar.xz mirror://gentoo/genpatches-3.14-49.extras.tar.xz mirror://gentoo/genpatches-3.14-49.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patch-3.14-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patches/3.14-sched-bfs-447.patch )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a5beabd4329dcd2e022000c045d5fb02
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.14.44 b/metadata/md5-cache/sys-kernel/ck-sources-3.14.44
index 2ef1c3bb7cf7..44d8a509d196 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.14.44
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.14.44
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.44
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) mirror://gentoo/genpatches-3.14-50.base.tar.xz mirror://gentoo/genpatches-3.14-50.extras.tar.xz mirror://gentoo/genpatches-3.14-50.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patch-3.14-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.14/3.14-ck1/patches/3.14-sched-bfs-447.patch )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a9a0b5f13ff00d089db5386a7fccbb48
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.18.13 b/metadata/md5-cache/sys-kernel/ck-sources-3.18.13
index 7661f24ce18c..b0264e89d64a 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.18.13
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.18.13
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.18.13
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://gentoo/genpatches-3.18-15.base.tar.xz mirror://gentoo/genpatches-3.18-15.extras.tar.xz mirror://gentoo/genpatches-3.18-15.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.18/3.18-ck1/patch-3.18-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.18/3.18-ck1/patches/3.18-sched-bfs-460.patch )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fa01180d9a5d4aee8e8cca7821d00b57
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.18.14 b/metadata/md5-cache/sys-kernel/ck-sources-3.18.14
index 40baea9d685f..bb18a6db3019 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.18.14
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.18.14
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.18.14
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://gentoo/genpatches-3.18-16.base.tar.xz mirror://gentoo/genpatches-3.18-16.extras.tar.xz mirror://gentoo/genpatches-3.18-16.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.18/3.18-ck1/patch-3.18-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.18/3.18-ck1/patches/3.18-sched-bfs-460.patch )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c81c0ea57a5b54374256728872cf8d83
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.18.16 b/metadata/md5-cache/sys-kernel/ck-sources-3.18.16
index 4e974bb2f7d3..88a0b7255076 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.18.16
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.18.16
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.18.16
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://kernel/linux/kernel/v3.x/incr/patch-3.18.14-15.xz mirror://kernel/linux/kernel/v3.x/incr/patch-3.18.15-16.xz mirror://gentoo/genpatches-3.18-16.base.tar.xz mirror://gentoo/genpatches-3.18-16.extras.tar.xz mirror://gentoo/genpatches-3.18-16.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.18/3.18-ck1/patch-3.18-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.18/3.18-ck1/patches/3.18-sched-bfs-460.patch )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4505b0159963778f7d03ab18d475474b
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.19.8 b/metadata/md5-cache/sys-kernel/ck-sources-3.19.8
index 03eda6a79328..3affd45fbce3 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.19.8
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.19.8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.19.8
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.19-gnu/deblob-3.19 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.19-gnu/deblob-check -> deblob-check-3.19 ) mirror://gentoo/genpatches-3.19-9.base.tar.xz mirror://gentoo/genpatches-3.19-9.extras.tar.xz mirror://gentoo/genpatches-3.19-9.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.19/3.19-ck1/patch-3.19-ck1.xz ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.19/3.19-ck1/patches/3.19-sched-bfs-461.patch )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eb234ca9d466699d039bb4a84f04575a
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-3.4.107 b/metadata/md5-cache/sys-kernel/ck-sources-3.4.107
index e745d07566cb..c3cfca16868e 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-3.4.107
+++ b/metadata/md5-cache/sys-kernel/ck-sources-3.4.107
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.107
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.4-gnu/deblob-3.4 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.4-gnu/deblob-check -> deblob-check-3.4 ) mirror://gentoo/genpatches-3.4-90.base.tar.xz mirror://gentoo/genpatches-3.4-90.extras.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patch-3.4-ck3.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patches/3.4-sched-bfs-424.patch ) experimental? ( urwlocks? ( http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patches/bfs424-grq_urwlocks.patch http://ck.kolivas.org/patches/3.0/3.4/3.4-ck3/patches/urw-locks.patch ) )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c418060c9fe2c6898963cd14d4877da4
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.0.4-r1 b/metadata/md5-cache/sys-kernel/ck-sources-4.0.4-r1
index 0dddacd9eea1..2cbbf5ea2ce6 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.0.4-r1
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.0.4-r1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.0.4-r1
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) mirror://gentoo/genpatches-4.0-6.base.tar.xz mirror://gentoo/genpatches-4.0-6.extras.tar.xz mirror://gentoo/genpatches-4.0-6.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/4.0/4.0/4.0-ck1/patch-4.0-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/4.0/4.0/4.0-ck1/patches/4.0-sched-bfs-462.patch )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=549a768b6a7f69f9ed55ed7a1274d433
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.0.5 b/metadata/md5-cache/sys-kernel/ck-sources-4.0.5
index 0cc06a1c8209..2b61ea42c1ca 100644
--- a/metadata/md5-cache/sys-kernel/ck-sources-4.0.5
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.0.5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.0.5
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) mirror://gentoo/genpatches-4.0-7.base.tar.xz mirror://gentoo/genpatches-4.0-7.extras.tar.xz mirror://gentoo/genpatches-4.0-7.experimental.tar.xz !bfsonly? ( http://ck.kolivas.org/patches/4.0/4.0/4.0-ck1/patch-4.0-ck1.bz2 ) bfsonly? ( http://ck.kolivas.org/patches/4.0/4.0/4.0-ck1/patches/4.0-sched-bfs-462.patch )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cb68491c3702219b0110ae06c66bf519
diff --git a/metadata/md5-cache/sys-kernel/dracut-043 b/metadata/md5-cache/sys-kernel/dracut-043
new file mode 100644
index 000000000000..fa56985a6900
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/dracut-043
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=virtual/udev systemd? ( >=sys-apps/systemd-199 ) app-text/asciidoc >=dev-libs/libxslt-1.1.26 app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75.2 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Generic initramfs generation tool
+EAPI=4
+HOMEPAGE=http://dracut.wiki.kernel.org
+IUSE=debug selinux systemd
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/udev systemd? ( >=sys-apps/systemd-199 ) app-arch/cpio >=app-shells/bash-4.0 >sys-apps/kmod-5[tools] || ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd[sysv-utils] sys-apps/systemd-sysv-utils ) >=sys-apps/util-linux-2.21 debug? ( dev-util/strace ) selinux? ( sys-libs/libselinux sys-libs/libsepol sec-policy/selinux-dracut )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://kernel/linux/utils/boot/dracut/dracut-043.tar.xz
+_eclasses_=bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=50ca1b7efaa23276f8cbf9c9b0149c85
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.77 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.77
index cfda8c5833c9..efe51a4b2409 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.77
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.77
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.77
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-3.10 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-check -> deblob-check-3.10 ) mirror://gentoo/genpatches-3.10-84.base.tar.xz mirror://gentoo/genpatches-3.10-84.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-84.experimental.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6f77e84abc61ff38df7ccd01f62c55e3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.79 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.79
index 59c34fba7deb..068ba5a53d46 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.79
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.79
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.79
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-3.10 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-check -> deblob-check-3.10 ) mirror://gentoo/genpatches-3.10-85.base.tar.xz mirror://gentoo/genpatches-3.10-85.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-85.experimental.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b01868f22f7735a83c7af321ad40fe53
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.80 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.80
index 929a853ab733..c54113f48212 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.80
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.80
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.80
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-3.10 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-check -> deblob-check-3.10 ) mirror://gentoo/genpatches-3.10-86.base.tar.xz mirror://gentoo/genpatches-3.10-86.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-86.experimental.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7c5ec19ee17bb1cba989fd4e6e9d4bc4
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.81 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.81
index c06879068e0d..e97d45f64454 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.81
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.10.81
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.81
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-3.10 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-check -> deblob-check-3.10 ) mirror://gentoo/genpatches-3.10-87.base.tar.xz mirror://gentoo/genpatches-3.10-87.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-87.experimental.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=21e9a9611f7b3a3bedfbb39a2f7c2a49
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.44 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.44
index bd1e6e43e2f0..56fc777753c9 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.44
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.44
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.12.44
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.12-gnu/deblob-3.12 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.12-gnu/deblob-check -> deblob-check-3.12 ) mirror://gentoo/genpatches-3.12-43.base.tar.xz mirror://gentoo/genpatches-3.12-43.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-43.experimental.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d4a23b949dbefe70a845d84c1a00cc59
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.9999 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.9999
index 3ccbb5a22b22..0eaf4ffd973d 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.9999
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.12.9999
@@ -9,5 +9,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.12.9999
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.12.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1e4e3d5da51294d0fe63f9057614d95a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.41 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.41
index dd142f1ba482..154ca9a583c9 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.41
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.41
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.41
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) mirror://gentoo/genpatches-3.14-47.base.tar.xz mirror://gentoo/genpatches-3.14-47.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-47.experimental.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=aa940860e786c9871b250315619cbef8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.42 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.42
index 0a9f9da52471..be089001ab11 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.42
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.42
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.42
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) mirror://gentoo/genpatches-3.14-48.base.tar.xz mirror://gentoo/genpatches-3.14-48.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-48.experimental.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=695bee25157f70a3529e56c118e0b4f9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.43 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.43
index c9c3c3364e17..e5b7e878d41b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.43
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.43
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.43
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) mirror://gentoo/genpatches-3.14-49.base.tar.xz mirror://gentoo/genpatches-3.14-49.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-49.experimental.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2c1dc457745b7d175a896c6f8c89fba9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.44 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.44
index fa6cd7111835..4da2f3ce7cd2 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.44
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.44
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.44
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) mirror://gentoo/genpatches-3.14-50.base.tar.xz mirror://gentoo/genpatches-3.14-50.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-50.experimental.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=edd0b5b6cc105c8ff5620177070871d7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.45 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.45
index 7ba2583d0baf..a9f4e26d420d 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.45
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.14.45
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.45
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) mirror://gentoo/genpatches-3.14-51.base.tar.xz mirror://gentoo/genpatches-3.14-51.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-51.experimental.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=521d8617b2c49c04ceb15d91b26ace0c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.16 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.16
index 5648601e147b..f823e304c9ba 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.16
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.18.16
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.18.16
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://gentoo/genpatches-3.18-17.base.tar.xz mirror://gentoo/genpatches-3.18-17.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-17.experimental.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5d272e0851ec0661f997c4f3ae7cd9e5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.19.8 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.19.8
index 63faae79ffad..4bbc8cefd292 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.19.8
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.19.8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.19.8
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz mirror://gentoo/genpatches-3.19-9.base.tar.xz mirror://gentoo/genpatches-3.19-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.19-9.experimental.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8e7d790d65ed498638392fa011b492f9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.106 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.106
index 52c57303b283..1cbb4b1a869d 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.106
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.106
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.106
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz mirror://gentoo/genpatches-3.4-89.base.tar.xz mirror://gentoo/genpatches-3.4-89.extras.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2fa46f116010d73e6927209d861dd4cf
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.107 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.107
index 3e7ee7f7c379..ff47816090cc 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.107
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.107
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.107
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz mirror://gentoo/genpatches-3.4-90.base.tar.xz mirror://gentoo/genpatches-3.4-90.extras.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=51311eb3eb912db14399d727cf3fdb4c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.9999 b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.9999
index 418887bdc9be..4223a91e9cfa 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.9999
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-3.4.9999
@@ -9,5 +9,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.9999
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.4.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=58a248dc27e079d12418dfecd4aa32cb
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.4 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.4
index 9f43a62e5da9..ca3409db1572 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.4
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.0.4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) mirror://gentoo/genpatches-4.0-6.base.tar.xz mirror://gentoo/genpatches-4.0-6.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.0-6.experimental.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ec8ea9bb4783425130c980f7c4dbd2e3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.5 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.5
index d8324ad55272..0c6b0c2f4268 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.5
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.0.5
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) mirror://gentoo/genpatches-4.0-7.base.tar.xz mirror://gentoo/genpatches-4.0-7.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.0-7.experimental.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=907dde3da4d40aaceb9c11ec453c2347
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.6 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.6
index 2d27b4f2f44d..68c36f2c1017 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.6
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.0.6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.0.6
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) mirror://gentoo/genpatches-4.0-8.base.tar.xz mirror://gentoo/genpatches-4.0-8.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.0-8.experimental.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5e38e85aefb7f2e6d77173caab4a0003
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.1.0 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.1.0
index ebef2daf8b84..919563067650 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.1.0
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.1.0
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-4.1 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-check -> deblob-check-4.1 ) mirror://gentoo/genpatches-4.1-1.base.tar.xz mirror://gentoo/genpatches-4.1-1.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.1-1.experimental.tar.xz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9255f36bdb6368ad05a9003a1fb80d99
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.1.0-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.1.0-r1
new file mode 100644
index 000000000000..03690fc336ae
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.1.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.1 kernel tree
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches
+IUSE=deblob experimental symlink build kdbus deblob
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.1.0-r1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-4.1 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-check -> deblob-check-4.1 ) mirror://gentoo/genpatches-4.1-3.base.tar.xz mirror://gentoo/genpatches-4.1-3.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.1-3.experimental.tar.xz )
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=59ab00fd311a494ebc9aeddebc8d32ef
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.1_rc1 b/metadata/md5-cache/sys-kernel/git-sources-4.1_rc1
index 80900b281b9e..b86b38f19f9c 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-4.1_rc1
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.1_rc1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.1_rc1
 SRC_URI=mirror://kernel/linux/kernel/v4.x/testing/patch-4.1-rc1.xz mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b72b3bef0cd64eeda59810a351c227a6
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.1_rc2 b/metadata/md5-cache/sys-kernel/git-sources-4.1_rc2
index f253e503046c..549efbddebf4 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-4.1_rc2
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.1_rc2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.1_rc2
 SRC_URI=mirror://kernel/linux/kernel/v4.x/testing/patch-4.1-rc2.xz mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=48cf725445f19ca27215f157d4c1a8c9
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.1_rc3 b/metadata/md5-cache/sys-kernel/git-sources-4.1_rc3
index d595b8a33215..89da63830e9c 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-4.1_rc3
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.1_rc3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.1_rc3
 SRC_URI=mirror://kernel/linux/kernel/v4.x/testing/patch-4.1-rc3.xz mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=62adc69f41aaf9f456ec3d9c91660c5e
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.1_rc4 b/metadata/md5-cache/sys-kernel/git-sources-4.1_rc4
index d50d68ca5d83..aa190e8b741b 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-4.1_rc4
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.1_rc4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.1_rc4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/testing/patch-4.1-rc4.xz mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f57dda6069c01041deb4b339b47f5c5d
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.1_rc5 b/metadata/md5-cache/sys-kernel/git-sources-4.1_rc5
index 2942106a1bdb..163422d8bc87 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-4.1_rc5
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.1_rc5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.1_rc5
 SRC_URI=mirror://kernel/linux/kernel/v4.x/testing/patch-4.1-rc5.xz mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d5e37a8e74199d6d438e1205bbfe9462
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.1_rc6 b/metadata/md5-cache/sys-kernel/git-sources-4.1_rc6
index ad87a89666fc..15fa243bc35d 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-4.1_rc6
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.1_rc6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.1_rc6
 SRC_URI=mirror://kernel/linux/kernel/v4.x/testing/patch-4.1-rc6.xz mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=563bb36886c06e83a25cde1a1d5e7eca
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.1_rc7 b/metadata/md5-cache/sys-kernel/git-sources-4.1_rc7
index 5b8868e146bd..e336cf2ec27e 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-4.1_rc7
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.1_rc7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.1_rc7
 SRC_URI=mirror://kernel/linux/kernel/v4.x/testing/patch-4.1-rc7.xz mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fa50f0686ba39a31151dfc04930b88a8
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.1_rc8 b/metadata/md5-cache/sys-kernel/git-sources-4.1_rc8
index 6d29f95f240b..fbe3d90c0bdc 100644
--- a/metadata/md5-cache/sys-kernel/git-sources-4.1_rc8
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.1_rc8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.1_rc8
 SRC_URI=mirror://kernel/linux/kernel/v4.x/testing/patch-4.1-rc8.xz mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c1ae910cf0bb5cbb529e7377b29b1b70
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.35 b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.35
index db5481a1d623..4a5aa168afcf 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.35
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.35
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-
 RESTRICT=binchecks strip
 SLOT=3.14.35
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.14.35-1.extras.tar.bz2 mirror://gentoo/genpatches-3.14-39.base.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e0688d65817b697f0483603833ef2eeb
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.43-r3 b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.43-r3
index 2c9c306f3bce..58c0d04e7f04 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.43-r3
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.43-r3
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-
 RESTRICT=binchecks strip
 SLOT=3.14.43-r3
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.14.43-4.extras.tar.bz2 mirror://gentoo/genpatches-3.14-49.base.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3e26a86865cbf197f88c1680b709bef4
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.43-r4 b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.43-r4
index bdb68f9f148c..309f8e59c010 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.43-r4
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.43-r4
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-
 RESTRICT=binchecks strip
 SLOT=3.14.43-r4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.14.43-5.extras.tar.bz2 mirror://gentoo/genpatches-3.14-49.base.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c3a60964767ddadea1eb720caf2162df
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.44 b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.44
index ed9d3ca9488e..e686d4be81c1 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.44
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.44
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-
 RESTRICT=binchecks strip
 SLOT=3.14.44
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.14.44-1.extras.tar.bz2 mirror://gentoo/genpatches-3.14-50.base.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=42b88ba32b8bff4e84e76aa4200ce7b2
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.45 b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.45-r1
similarity index 81%
rename from metadata/md5-cache/sys-kernel/hardened-sources-3.14.45
rename to metadata/md5-cache/sys-kernel/hardened-sources-3.14.45-r1
index cb9fb64025ee..a781af422508 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.14.45
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.14.45-r1
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.14.45
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.14.45-1.extras.tar.bz2 mirror://gentoo/genpatches-3.14-51.base.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=9e37eb03144306417ee0253239c84775
+SLOT=3.14.45-r1
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.14.45-2.extras.tar.bz2 mirror://gentoo/genpatches-3.14-51.base.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=3414b0e336656f7bddd5cf603cccb0c8
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.18.9 b/metadata/md5-cache/sys-kernel/hardened-sources-3.18.9
index 199751347358..fdbdb926ee70 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.18.9
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.18.9
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-
 RESTRICT=binchecks strip
 SLOT=3.18.9
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.18.9-1.extras.tar.bz2 mirror://gentoo/genpatches-3.18-10.base.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c638d527ceecabe7a16b1def9b0e6dbf
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.68 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.68
index a4df15919b04..6b4afe3ae9d5 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.68
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.68
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-
 RESTRICT=binchecks strip
 SLOT=3.2.68
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.2-gnu/deblob-3.2 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.2-gnu/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.68-1.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5af9d558f03850ef03bfc3b9a88cf5e3
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.69-r4 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.69-r4
index 0ff530fa74c0..b1f8634d70a6 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.69-r4
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.69-r4
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-
 RESTRICT=binchecks strip
 SLOT=3.2.69-r4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.2-gnu/deblob-3.2 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.2-gnu/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.69-5.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=208a29a71d13882851e6bf426f607c15
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.69-r5 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.69-r5
index b548de8c3159..80db6e27a4cc 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.69-r5
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.69-r5
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-
 RESTRICT=binchecks strip
 SLOT=3.2.69-r5
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.2-gnu/deblob-3.2 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.2-gnu/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.69-6.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6869659cda6b2856553013510cf2ec0a
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.69-r6 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.69-r6
index 80d0dc9618f3..d64fa568a705 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.69-r6
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.69-r6
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-
 RESTRICT=binchecks strip
 SLOT=3.2.69-r6
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.2-gnu/deblob-3.2 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.2-gnu/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.69-7.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0ce5e42c724a1172bd22d11fe6eee3f6
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.69-r7 b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.69-r8
similarity index 82%
rename from metadata/md5-cache/sys-kernel/hardened-sources-3.2.69-r7
rename to metadata/md5-cache/sys-kernel/hardened-sources-3.2.69-r8
index 4cf55e3f5aff..d7562f09162f 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-3.2.69-r7
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-3.2.69-r8
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=3.2.69-r7
-SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.2-gnu/deblob-3.2 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.2-gnu/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.69-8.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=3295d9148a4d64ef57faf7bae92f7453
+SLOT=3.2.69-r8
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.2-gnu/deblob-3.2 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.2-gnu/deblob-check -> deblob-check-3.2 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.2.69-9.extras.tar.bz2 mirror://gentoo/genpatches-3.2-16.base.tar.xz mirror://gentoo/genpatches-3.2-16.extras.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=1d654302c2dcef4cf4ce20bc00737933
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-4.0.4-r3 b/metadata/md5-cache/sys-kernel/hardened-sources-4.0.4-r3
index b62386a4c086..b21dd2115557 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.0.4-r3
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-4.0.4-r3
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-
 RESTRICT=binchecks strip
 SLOT=4.0.4-r3
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.0.4-4.extras.tar.bz2 mirror://gentoo/genpatches-4.0-6.base.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9458ae6c8ce8a32b1eabfeea31415bd4
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-4.0.4-r4 b/metadata/md5-cache/sys-kernel/hardened-sources-4.0.4-r4
index 04f003c35511..f98ea65c0eb1 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.0.4-r4
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-4.0.4-r4
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-
 RESTRICT=binchecks strip
 SLOT=4.0.4-r4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.0.4-5.extras.tar.bz2 mirror://gentoo/genpatches-4.0-6.base.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=18937deeba3d283e431991d15fbf80c5
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-4.0.5 b/metadata/md5-cache/sys-kernel/hardened-sources-4.0.5
index f84101617201..4902699cbfcb 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.0.5
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-4.0.5
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-
 RESTRICT=binchecks strip
 SLOT=4.0.5
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.0.5-1.extras.tar.bz2 mirror://gentoo/genpatches-4.0-7.base.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=409c1a532eeb0925d7cd1ecb09b6ff3f
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-4.0.5-r1 b/metadata/md5-cache/sys-kernel/hardened-sources-4.0.5-r1
index c9f8a29ffe3a..d26b923aa279 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.0.5-r1
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-4.0.5-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-
 RESTRICT=binchecks strip
 SLOT=4.0.5-r1
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.0.5-2.extras.tar.bz2 mirror://gentoo/genpatches-4.0-7.base.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=564b27bddacb2c3276e5a9e9f004c2f7
diff --git a/metadata/md5-cache/sys-kernel/hardened-sources-4.0.6 b/metadata/md5-cache/sys-kernel/hardened-sources-4.0.6-r1
similarity index 81%
rename from metadata/md5-cache/sys-kernel/hardened-sources-4.0.6
rename to metadata/md5-cache/sys-kernel/hardened-sources-4.0.6-r1
index aa1d3b127aac..42e3d6431b8c 100644
--- a/metadata/md5-cache/sys-kernel/hardened-sources-4.0.6
+++ b/metadata/md5-cache/sys-kernel/hardened-sources-4.0.6-r1
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2 !deblob? ( freedist )
 RDEPEND=>=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
-SLOT=4.0.6
-SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.0.6-1.extras.tar.bz2 mirror://gentoo/genpatches-4.0-8.base.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=edb27cd26cb9e4a20b677799a031c2ad
+SLOT=4.0.6-r1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-4.0.6-2.extras.tar.bz2 mirror://gentoo/genpatches-4.0-8.base.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=66cd32eb338534005cab7b3c1364704c
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-2.4.33.3 b/metadata/md5-cache/sys-kernel/linux-headers-2.4.33.3
index c6c4f763d3d3..44a7e7fd00b0 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-2.4.33.3
+++ b/metadata/md5-cache/sys-kernel/linux-headers-2.4.33.3
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v2.4/patch-2.4.33.3.xz mirror://kernel/linux/kernel/v2.4/linux-2.4.33.tar.xz mirror://gentoo/gentoo-headers-2.4.33-1.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5d12862e648887fc3c200891cc3e568f
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-2.4.36 b/metadata/md5-cache/sys-kernel/linux-headers-2.4.36
index bc9c06a88859..d2adcf61c5d7 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-2.4.36
+++ b/metadata/md5-cache/sys-kernel/linux-headers-2.4.36
@@ -7,5 +7,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://kernel/linux/kernel/v2.4/linux-2.4.36.tar.xz mirror://gentoo/gentoo-headers-2.4.36-1.tar.lzma
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=55810c0e42717305b282cb2ce51f85d9
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.1 b/metadata/md5-cache/sys-kernel/linux-headers-3.1
index b0b4d7fc2994..acbaacaf339f 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.1.tar.xz mirror://gentoo/gentoo-headers-3.1-2.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eff2bb73a854ba6b3f76bb9cf65ecd34
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.10 b/metadata/md5-cache/sys-kernel/linux-headers-3.10
index cad3eedc2b5f..4c264e5dcc80 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.10
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.10
@@ -9,5 +9,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.10.tar.xz mirror://gentoo/gentoo-headers-3.10-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b7a7d5916444e501b2b5ffe149cb9596
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.11 b/metadata/md5-cache/sys-kernel/linux-headers-3.11
index 9abfdeafa85a..3cc6668d15bd 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.11
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.11
@@ -9,5 +9,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.11.tar.xz mirror://gentoo/gentoo-headers-3.11-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bf68bf329bc822328db88fe53f015c35
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.12 b/metadata/md5-cache/sys-kernel/linux-headers-3.12
index 21286d676bc2..885ae36470ee 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.12
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.12
@@ -9,5 +9,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.12.tar.xz mirror://gentoo/gentoo-headers-3.12-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b94d3d9a378933e6c140a0868acfc327
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.13 b/metadata/md5-cache/sys-kernel/linux-headers-3.13
index 84056e0608e5..ac01b0a14101 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.13
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.13
@@ -9,5 +9,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.13.tar.xz mirror://gentoo/gentoo-headers-3.13-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=396fa5c56f61706dd3b45849ce7d254c
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.14 b/metadata/md5-cache/sys-kernel/linux-headers-3.14
index b4b3e5e261cd..50a0bf827d3d 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.14
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.14
@@ -9,5 +9,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.14.tar.xz mirror://gentoo/gentoo-headers-3.14-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b4bc256957061213914b73f699f58550
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.15 b/metadata/md5-cache/sys-kernel/linux-headers-3.15
index a0f892f6dafe..c687cd509ba1 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.15
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.15
@@ -9,5 +9,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.15.tar.xz mirror://gentoo/gentoo-headers-3.15-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=befe861ea9d7c0f3ee40cb4a2755032f
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.16 b/metadata/md5-cache/sys-kernel/linux-headers-3.16
index e35ece1db00c..a1592fc0fc83 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.16
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.16
@@ -9,5 +9,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.16.tar.xz mirror://gentoo/gentoo-headers-3.16-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=44acc4f180be914f2dc882779fab77ae
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.17 b/metadata/md5-cache/sys-kernel/linux-headers-3.17
index ccb18a8cbf08..748706addb6e 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.17
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.17
@@ -9,5 +9,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.17.tar.xz mirror://gentoo/gentoo-headers-3.17-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=25a6ca10d9a9b8063759d29ca031d0b0
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.17-r1 b/metadata/md5-cache/sys-kernel/linux-headers-3.17-r1
index 78ab54295b06..fb12de881be0 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.17-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.17-r1
@@ -9,5 +9,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.17.tar.xz mirror://gentoo/gentoo-headers-3.17-3.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ece56afd21a4fd62400bc8a5ebf1da59
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.18 b/metadata/md5-cache/sys-kernel/linux-headers-3.18
index 3ed93bfc93a1..d88b8f201a8b 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.18
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.18
@@ -9,5 +9,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.18.tar.xz mirror://gentoo/gentoo-headers-3.18-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=381eb68355105f73c503aa438b8c8843
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.19 b/metadata/md5-cache/sys-kernel/linux-headers-3.19
index 2e9b0bf187fe..3d31de451cd9 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.19
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.19
@@ -9,5 +9,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.19.tar.xz mirror://gentoo/gentoo-headers-3.19-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=36ac46025762a2b5fd9d339f456ebfd4
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.2-r1 b/metadata/md5-cache/sys-kernel/linux-headers-3.2-r1
index c6db804206dd..1b37e71df0b2 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.2-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.2-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.2.tar.xz mirror://gentoo/gentoo-headers-3.2-3.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=cb83a8f51725ac56939d03217f92e8d2
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.3 b/metadata/md5-cache/sys-kernel/linux-headers-3.3
index 3dae3be3bb76..8af88133260d 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.3
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.3.tar.xz mirror://gentoo/gentoo-headers-3.3-2.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=eab5bb6562e27a177982f8d6ea4d5d56
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.4 b/metadata/md5-cache/sys-kernel/linux-headers-3.4
index 7073311348f6..f411e138cbec 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.4
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.4.tar.xz mirror://gentoo/gentoo-headers-3.4-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5ce3762db98d8572ea6a7616e8e0ab1b
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.4-r1 b/metadata/md5-cache/sys-kernel/linux-headers-3.4-r1
index aa22acece60e..a957d6eb8ebf 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.4-r1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.4-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.4.tar.xz mirror://gentoo/gentoo-headers-3.4-2.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=68690332831a99d9b7f19b127f86d16b
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.4-r2 b/metadata/md5-cache/sys-kernel/linux-headers-3.4-r2
index b9eeebbc443d..3806ecc44c06 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.4-r2
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.4-r2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.4.tar.xz mirror://gentoo/gentoo-headers-3.4-3.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=29eaeac7062fcee44fee7238980c25f5
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.5 b/metadata/md5-cache/sys-kernel/linux-headers-3.5
index 26550f70a7bd..ed2391362a28 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.5
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.5.tar.xz mirror://gentoo/gentoo-headers-3.5-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f9db94b8137695cac0606540d625f3c4
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.6 b/metadata/md5-cache/sys-kernel/linux-headers-3.6
index 9b7b8a8a09eb..c73ce9c3bdd0 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.6
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.6
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.6.tar.xz mirror://gentoo/gentoo-headers-3.6-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=be2031f5fc744b5b3fb26305a4cd57d5
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.7 b/metadata/md5-cache/sys-kernel/linux-headers-3.7
index b0fe6b80f016..fd1bf2fde0a0 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.7
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.7
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.7.tar.xz mirror://gentoo/gentoo-headers-3.7-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f3e868a99d7a81d6d70495684a4e92e6
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.8 b/metadata/md5-cache/sys-kernel/linux-headers-3.8
index ba663239aeb2..81817ec5fdea 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.8
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.8
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.8.tar.xz mirror://gentoo/gentoo-headers-3.8-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=af4305ac0cf48b61b88d61ada4406e7a
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-3.9 b/metadata/md5-cache/sys-kernel/linux-headers-3.9
index 91dee0221531..09dd02844e1f 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-3.9
+++ b/metadata/md5-cache/sys-kernel/linux-headers-3.9
@@ -9,5 +9,5 @@ RDEPEND=!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-3.9.tar.xz mirror://gentoo/gentoo-headers-3.9-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fad8ce0dff279bcf4594b6f871ed9116
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.0 b/metadata/md5-cache/sys-kernel/linux-headers-4.0
index 14059caf5b90..7518b072adde 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.0
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.0
@@ -9,5 +9,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.0.tar.xz mirror://gentoo/gentoo-headers-4.0-2.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=04c117b897da2e9d53a8a5b6d60a6ddc
diff --git a/metadata/md5-cache/sys-kernel/linux-headers-4.1 b/metadata/md5-cache/sys-kernel/linux-headers-4.1
index 231eeb131ce0..9e72239cad7f 100644
--- a/metadata/md5-cache/sys-kernel/linux-headers-4.1
+++ b/metadata/md5-cache/sys-kernel/linux-headers-4.1
@@ -9,5 +9,5 @@ RDEPEND=!!media-sound/alsa-headers
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=mirror://gentoo/gentoo-headers-base-4.1.tar.xz mirror://gentoo/gentoo-headers-4.1-1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=20d7c7f8cce29782d9b2b20acf0bccb8
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-3.19.6 b/metadata/md5-cache/sys-kernel/mips-sources-3.19.6
index 8108e28b7337..043ad56915a5 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-3.19.6
+++ b/metadata/md5-cache/sys-kernel/mips-sources-3.19.6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.19.6
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.19.6.xz mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz mirror://gentoo/mipsgit-3.19.0-20150418.diff.xz mirror://gentoo/mips-sources-3.19.0-patches-v2.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bdfc090735e1f3096942fff2b00243bc
diff --git a/metadata/md5-cache/sys-kernel/mips-sources-4.0.1 b/metadata/md5-cache/sys-kernel/mips-sources-4.0.1
index f5bd94d8a025..9c26405dc0c2 100644
--- a/metadata/md5-cache/sys-kernel/mips-sources-4.0.1
+++ b/metadata/md5-cache/sys-kernel/mips-sources-4.0.1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.0.1
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.0.1.xz mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz mirror://gentoo/mipsgit-4.0.0-20150418.diff.xz mirror://gentoo/mips-sources-4.0.0-patches-v1.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=aaced4db525f78de93b9f636f2d89193
diff --git a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.106.4 b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.106.4
index 35f029e9deec..72bdcdd998c4 100644
--- a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.106.4
+++ b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.106.4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.32.106.4
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz http://download.openvz.org/kernel/branches/rhel6-2.6.32/042stab106.4/patches/patch-042stab106.4-combined.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=daafd513a851bda83028d13d3e762a5a
diff --git a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.5 b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.5
index 7a5aa6fc32b8..07cd91590745 100644
--- a/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.5
+++ b/metadata/md5-cache/sys-kernel/openvz-sources-2.6.32.108.5
@@ -4,11 +4,11 @@ DESCRIPTION=Kernel sources with OpenVZ patchset
 EAPI=5
 HOMEPAGE=http://www.openvz.org
 IUSE=symlink build
-KEYWORDS=~amd64 ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 ~ppc64 ~sparc x86
 LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=2.6.32.108.5
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz http://download.openvz.org/kernel/branches/rhel6-2.6.32/042stab108.5/patches/patch-042stab108.5-combined.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=aa0882375c1aba54b501cf64fa8bed32
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=746e4e2efd07b3fa615183584a3e3443
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.31_p9 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.31_p9
index 92171c6748e4..7dfc0afaa176 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.31_p9
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.31_p9
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.31_p9
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.31.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.31-gnu/deblob-2.6.31 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.31-gnu/deblob-check -> deblob-check-2.6.31 ) http://pf.natalenko.name/sources/2.6.31/patch-2.6.31-pf9.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=83b7e414faec5f4e839c539e0b54327a
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.32_p16 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.32_p16
index a123e42793a9..28385ecfa187 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.32_p16
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.32_p16
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.32_p16
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.32.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.32-gnu/deblob-2.6.32 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.32-gnu/deblob-check -> deblob-check-2.6.32 ) http://pf.natalenko.name/sources/2.6.32/patch-2.6.32-pf16.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=453534c39d4a7770f2ce817aa8c313cb
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.33_p4 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.33_p4
index a02a73814505..2f8d2b03d3a9 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.33_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.33_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.33_p4
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.33.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.33-gnu/deblob-2.6.33 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.33-gnu/deblob-check -> deblob-check-2.6.33 ) http://pf.natalenko.name/sources/2.6.33/patch-2.6.33-pf4.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=05cc04456a8b95814a455a8dd18f5de5
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.34_p7 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.34_p7
index 75db7504523c..779e58f39b3f 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.34_p7
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.34_p7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.34_p7
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.34.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.34-gnu/deblob-2.6.34 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.34-gnu/deblob-check -> deblob-check-2.6.34 ) http://pf.natalenko.name/sources/2.6.34/patch-2.6.34-pf7.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c07848061e38da1f5001fafcbe74863a
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.35_p11 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.35_p11
index d04985321eee..63fae5a03ea8 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.35_p11
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.35_p11
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.35_p11
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.35.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.35-gnu/deblob-2.6.35 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.35-gnu/deblob-check -> deblob-check-2.6.35 ) http://pf.natalenko.name/sources/2.6.35/patch-2.6.35-pf11.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=965062753e0b9b99cb1573fa830d6398
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.36_p6 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.36_p6
index 030572eb32a3..2726a4f42107 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.36_p6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.36_p6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.36_p6
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.36.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.36-gnu/deblob-2.6.36 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.36-gnu/deblob-check -> deblob-check-2.6.36 ) http://pf.natalenko.name/sources/2.6.36/patch-2.6.36-pf6.bz2 experimental? ( http://ck.kolivas.org/patches/bfs/bfs357-penalise_fork_depth_account_threads.patch )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5f547ba09610df072f5f36a9e3757941
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.37_p6 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.37_p6
index 3f01d7775612..4cadf6d10194 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.37_p6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.37_p6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.37_p6
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.37.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.37-gnu/deblob-2.6.37 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.37-gnu/deblob-check -> deblob-check-2.6.37 ) http://pf.natalenko.name/sources/2.6.37/patch-2.6.37-pf6.bz2 experimental? ( http://ck.kolivas.org/patches/bfs/bfs357-penalise_fork_depth_account_threads.patch )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e3742ef1d07e3e99981764174ce3f810
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.38_p8 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.38_p8
index 303c7c838f8a..55fc7c5b29b1 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.38_p8
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.38_p8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.38_p8
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.38.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.38-gnu/deblob-2.6.38 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.38-gnu/deblob-check -> deblob-check-2.6.38 ) http://pf.natalenko.name/sources/2.6.38/patch-2.6.38-pf8.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c2ceba337a95d6ba34fe410bb6bb45ad
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-2.6.39_p4 b/metadata/md5-cache/sys-kernel/pf-sources-2.6.39_p4
index e048ccb9e946..c8a082707598 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-2.6.39_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-2.6.39_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.39_p4
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.39.tar.xz http://pf.natalenko.name/sources/2.6.39/patch-2.6.39-pf4.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=55cf78e7ce46e5b4ed59a93041549375
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.0.7-r2 b/metadata/md5-cache/sys-kernel/pf-sources-3.0.7-r2
index 3b487e7785ca..8dac155cc67e 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.0.7-r2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.0.7-r2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.0.7-r2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.0.tar.xz http://pf.natalenko.name/sources/3.0/patch-3.0.7-pf.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=94435e6fc9f1720f37adfdf2d60d5422
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.1.6-r2 b/metadata/md5-cache/sys-kernel/pf-sources-3.1.6-r2
index 0b739ec065bf..5079802d5540 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.1.6-r2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.1.6-r2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.1.6-r2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.xz http://pf.natalenko.name/sources/3.1/patch-3.1.6-pf.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5b8acc7a823253817cec85de90ed5cc1
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.10.1 b/metadata/md5-cache/sys-kernel/pf-sources-3.10.1
index 85775e00a529..b4ca5f48c49b 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.10.1
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.10.1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz http://pf.natalenko.name/sources/3.10/patch-3.10.1-pf.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c626f80741357c2139b0172e2bac24a7
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.11.4 b/metadata/md5-cache/sys-kernel/pf-sources-3.11.4
index 21e084bd3c44..79680ff722ce 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.11.4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.11.4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.11.4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.11.tar.xz http://pf.natalenko.name/sources/3.11/patch-3.11.4-pf.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a63201db6cb3d2000f05b4107495407e
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.12.4 b/metadata/md5-cache/sys-kernel/pf-sources-3.12.4
index b704bb740fa0..a5ed63ca3cb6 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.12.4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.12.4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.12.4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz http://pf.natalenko.name/sources/3.12/patch-3.12.4-pf.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=75eca1490af30bca6c490a25b0ef4dbc
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.13.3 b/metadata/md5-cache/sys-kernel/pf-sources-3.13.3
index 0b7320c96528..77cbbe179207 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.13.3
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.13.3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.13.3
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.13.tar.xz http://pf.natalenko.name/sources/3.13/patch-3.13.3-pf.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=292359526f21cf8f2355e05513c45c1b
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.14_p4 b/metadata/md5-cache/sys-kernel/pf-sources-3.14_p4
index cd5b719a7ca4..6d19e1c7b301 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.14_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.14_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14_p4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz http://pf.natalenko.name/sources/3.14/patch-3.14-pf4.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=2a851f06d700e97f30bc007e5a6f1557
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.15_p5 b/metadata/md5-cache/sys-kernel/pf-sources-3.15_p5
index 00f72fb0d20e..3cbc1bcc2fd6 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.15_p5
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.15_p5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.15_p5
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.15.tar.xz http://pf.natalenko.name/sources/3.15/patch-3.15-pf5.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dcb502ecf035100e3b7d187b7c0dd7f3
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.16_p4 b/metadata/md5-cache/sys-kernel/pf-sources-3.16_p4
index 79f8830c0962..08c07ea60674 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.16_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.16_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.16_p4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.16.tar.xz http://pf.natalenko.name/sources/3.16/patch-3.16-pf4.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1aa36f53c1c08e9c7ed1b5d3f0ea644e
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.17_p4 b/metadata/md5-cache/sys-kernel/pf-sources-3.17_p4
index caead5511aed..fc4e9d47484d 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.17_p4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.17_p4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.17_p4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.17.tar.xz http://pf.natalenko.name/sources/3.17/patch-3.17-pf4.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4cafb0cdd60e6a89005f20187aac6e09
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.19_p1 b/metadata/md5-cache/sys-kernel/pf-sources-3.19_p1
index 8aeb31282309..bd1a291f2371 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.19_p1
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.19_p1
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.19_p1
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz http://pf.natalenko.name/sources/3.19/patch-3.19-pf1.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=629cee7db18a15830c4f8f573bf1de7d
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.2.7 b/metadata/md5-cache/sys-kernel/pf-sources-3.2.7
index b0348e9010b8..09047c86d223 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.2.7
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.2.7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.2.7
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz http://pf.natalenko.name/sources/3.2/patch-3.2.7-pf.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=df99e14eea391d236bc6553e15aa74a0
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.3.6 b/metadata/md5-cache/sys-kernel/pf-sources-3.3.6
index 54de42c361da..0c5f0bac2b30 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.3.6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.3.6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.3.6
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.3.tar.xz http://pf.natalenko.name/sources/3.3/patch-3.3.6-pf.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4eca91876268b206f008f3ed65161421
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.4.6 b/metadata/md5-cache/sys-kernel/pf-sources-3.4.6
index b624f9b35ed1..32c5a5b318cf 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.4.6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.4.6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.6
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz http://pf.natalenko.name/sources/3.4/patch-3.4.6-pf.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b1bad93758c386dd1edb16e32206f45d
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.5.4 b/metadata/md5-cache/sys-kernel/pf-sources-3.5.4
index 17865a855b2c..256fcae36a2b 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.5.4
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.5.4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.5.4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.5.tar.xz http://pf.natalenko.name/sources/3.5/patch-3.5.4-pf.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=601d6039031635c15e4ddb9d9059143a
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.6.12 b/metadata/md5-cache/sys-kernel/pf-sources-3.6.12
index 5bdd4dd88174..3149954e183e 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.6.12
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.6.12
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.6.12
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.6.tar.xz http://pf.natalenko.name/sources/3.6/patch-3.6.12-pf.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7f05b55f7826303d6e29e6156af03d55
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.7.5 b/metadata/md5-cache/sys-kernel/pf-sources-3.7.5
index 7b22920e0377..d6da59fb924a 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.7.5
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.7.5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.7.5
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.7.tar.xz http://pf.natalenko.name/sources/3.7/patch-3.7.5-pf.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d7794b5f12e141f25ff0f467b5f24b1f
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.8.2 b/metadata/md5-cache/sys-kernel/pf-sources-3.8.2
index f51a75cc5636..d847dad23092 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.8.2
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.8.2
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.8.2
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.8.tar.xz http://pf.natalenko.name/sources/3.8/patch-3.8.2-pf.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d4c5cb7ea192553a1f35c38e842608d5
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-3.9.5 b/metadata/md5-cache/sys-kernel/pf-sources-3.9.5
index 987467b47f9d..de84ddee3d98 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-3.9.5
+++ b/metadata/md5-cache/sys-kernel/pf-sources-3.9.5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.9.5
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.9.tar.xz http://pf.natalenko.name/sources/3.9/patch-3.9.5-pf.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ab1a8079e94b114e71104f82ed6f2ff5
diff --git a/metadata/md5-cache/sys-kernel/pf-sources-4.0_p6 b/metadata/md5-cache/sys-kernel/pf-sources-4.0_p6
index 25b3fd5830e4..ec0e4eefacb3 100644
--- a/metadata/md5-cache/sys-kernel/pf-sources-4.0_p6
+++ b/metadata/md5-cache/sys-kernel/pf-sources-4.0_p6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.0_p6
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz http://pf.natalenko.name/sources/4.0/patch-4.0-pf6.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a341d5a6ea23cb47bd9fe59064776ba7
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.1_pre-r20130719 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.1_pre-r20130719
index b6d4ec6fbeac..f4b9a206b3f0 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.1_pre-r20130719
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.1_pre-r20130719
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.1_pre-r20130719
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.10.1.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz http://dev.gentoo.org/~xmw/raspberrypi-sources/raspberrypi-sources-3.10.1_pre-r20130719.patch.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4772cc56eed38ef06fafd245e481ad86
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.9999
index bd22e649c965..53698e5c0891 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.10.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.10.9999
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a66f16cacc26afb0497cb8254fcb8a3a
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.12.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.12.9999
index 692505e5b46f..3936e0b9a315 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.12.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.12.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.12.9999
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c3e5da4ce9a68a8ae6b081641803d6db
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.14.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.14.9999
index 056b5e1f7415..7cd77186507f 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.14.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.14.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.14.9999
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8d1345be3d2440edd41e4fcb393d872f
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.18.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.18.9999
index 6fcee520b9cf..6e3c4a9ea66c 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.18.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.18.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.18.9999
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dac409436255eb38790499a940063547
diff --git a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.19.9999 b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.19.9999
index 7dfb224f8ff2..71ebad788043 100644
--- a/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.19.9999
+++ b/metadata/md5-cache/sys-kernel/raspberrypi-sources-3.19.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.19.9999
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5100e4de3c12fd53c414168a80e4a06c
diff --git a/metadata/md5-cache/sys-kernel/rsbac-sources-3.10.7 b/metadata/md5-cache/sys-kernel/rsbac-sources-3.10.7
index 591f891a876b..1340e0594793 100644
--- a/metadata/md5-cache/sys-kernel/rsbac-sources-3.10.7
+++ b/metadata/md5-cache/sys-kernel/rsbac-sources-3.10.7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.7
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz http://download.rsbac.org/patches/1.4.7/patch-linux-3.10.7-rsbac-1.4.7.diff.xz mirror://gentoo/genpatches-3.10-13.base.tar.xz mirror://gentoo/genpatches-3.10-13.extras.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=92abb33225e60a82f382288eeba1b4be
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.14.36_p34 b/metadata/md5-cache/sys-kernel/rt-sources-3.14.36_p34
index 94f0af2d4eb5..0f8693af6e22 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.14.36_p34
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.14.36_p34
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.36_p34
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.14.36.xz mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 ) mirror://kernel/linux/kernel/projects/rt/3.14/patch-3.14.36-rt34.patch.xz mirror://kernel/linux/kernel/projects/rt/3.14/older/patch-3.14.36-rt34.patch.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=ef161e2ce5fe5c455f410c6c830210d5
diff --git a/metadata/md5-cache/sys-kernel/rt-sources-3.18.11_p7 b/metadata/md5-cache/sys-kernel/rt-sources-3.18.11_p7
index ead9694423f4..b268a5364069 100644
--- a/metadata/md5-cache/sys-kernel/rt-sources-3.18.11_p7
+++ b/metadata/md5-cache/sys-kernel/rt-sources-3.18.11_p7
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.18.11_p7
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.11.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 ) mirror://kernel/linux/kernel/projects/rt/3.18/patch-3.18.11-rt7.patch.xz mirror://kernel/linux/kernel/projects/rt/3.18/older/patch-3.18.11-rt7.patch.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a82cd07041e2d022b539a58f61b27806
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.79 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.79
index 924bef227e46..3c198e8d8bd4 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.79
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.79
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.10.79
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-85.base.tar.xz mirror://gentoo/genpatches-3.10-85.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-85.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.10.77-2015-05-11.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6c528c555c5677d5955bb262429fdb9f
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.80 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.80
index c2843d7e8c1d..807a641c6893 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.80
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.80
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.10.80
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-86.base.tar.xz mirror://gentoo/genpatches-3.10-86.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-86.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.10.79-2015-06-04.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=09b1ad323658905d30dbcb82e7410109
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.81 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.81
new file mode 100644
index 000000000000..22e528736823
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.10.81
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=TuxOnIce + Gentoo patchset sources
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
+IUSE=experimental symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.10.81
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz mirror://gentoo/genpatches-3.10-87.base.tar.xz mirror://gentoo/genpatches-3.10-87.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.10-87.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.10.80-2015-06-17.patch.bz2
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=d59a43d3e097eb39e70a4a433fcf4335
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.43 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.43
index f782f8e78a04..b71705a7e77d 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.43
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.43
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.12.43
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz mirror://gentoo/genpatches-3.12-42.base.tar.xz mirror://gentoo/genpatches-3.12-42.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-42.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.12.42-2015-05-11.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0125fa27fb9ba3f04e8bef21d22e2b13
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.44 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.44
new file mode 100644
index 000000000000..34fb02b35b83
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.12.44
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=TuxOnIce + Gentoo patchset sources
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
+IUSE=experimental symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.12.44
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz mirror://gentoo/genpatches-3.12-43.base.tar.xz mirror://gentoo/genpatches-3.12-43.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.12-43.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.12.44-2015-06-17.patch.bz2
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=996e4da48ccf6a7c433f4da31356dacf
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.43 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.43
index 118eda09bb4e..1c169e080d38 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.43
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.43
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.14.43
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz mirror://gentoo/genpatches-3.14-49.base.tar.xz mirror://gentoo/genpatches-3.14-49.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-49.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.14.41-2015-05-11.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=bb86074b9cb80a1895ac93a50424c021
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.44 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.44
index 7cf40920e9b1..604863fd04f2 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.44
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.44
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.14.44
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz mirror://gentoo/genpatches-3.14-50.base.tar.xz mirror://gentoo/genpatches-3.14-50.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-50.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.14.43-2015-06-04.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=08eb12a021cd5e8a861a2afae547c9c8
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.45 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.45
new file mode 100644
index 000000000000..7980fc237f7a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.14.45
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=TuxOnIce + Gentoo patchset sources
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
+IUSE=experimental symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.14.45
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz mirror://gentoo/genpatches-3.14-51.base.tar.xz mirror://gentoo/genpatches-3.14-51.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.14-51.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.14.44-2015-06-17.patch.bz2
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=7ba366b7e357f17130e781074770fd25
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.14 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.14
index 795a081fcf48..7800764342d3 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.14
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.14
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.18.14
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz mirror://gentoo/genpatches-3.18-16.base.tar.xz mirror://gentoo/genpatches-3.18-16.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-16.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.18.13-2015-05-11.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6b9ea6642109491d032840d9c31500df
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.16 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.16
new file mode 100644
index 000000000000..858a742e83a7
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.18.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=TuxOnIce + Gentoo patchset sources
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
+IUSE=experimental symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.18.16
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz mirror://gentoo/genpatches-3.18-17.base.tar.xz mirror://gentoo/genpatches-3.18-17.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.18-17.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.18.16-2015-06-17.patch.bz2
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=a93d315d939cb80d9a7d6a0c1fd1a6a4
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.19.8 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.19.8
index 2bc7d3e1e3cb..286e3e69655c 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.19.8
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.19.8
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.19.8
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.19.tar.xz mirror://gentoo/genpatches-3.19-9.base.tar.xz mirror://gentoo/genpatches-3.19-9.extras.tar.xz experimental? ( mirror://gentoo/genpatches-3.19-9.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.19.8-2015-05-12.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9f122177d1ff8e9d175d99cc9d33fa25
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.107 b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.107
index 3dfd4c7c5b2f..5585d8a48186 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.107
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-3.4.107
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=3.4.107
 SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz mirror://gentoo/genpatches-3.4-90.base.tar.xz mirror://gentoo/genpatches-3.4-90.extras.tar.xz http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-3.4.107-2015-04-18.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dcc06dc8207339bee66ac8c953c94e0a
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.0.4 b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.0.4
index b9dfdcf66367..db88bfeb6988 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.0.4
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.0.4
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=4.0.4
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz mirror://gentoo/genpatches-4.0-6.base.tar.xz mirror://gentoo/genpatches-4.0-6.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.0-6.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-4.0.2-2015-05-11.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1f61a589fd55dfe4a80b67a8630ce481
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.0.5 b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.0.5
index 2dfac792d20b..bb664c8114a7 100644
--- a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.0.5
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.0.5
@@ -10,5 +10,5 @@ RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys
 RESTRICT=binchecks strip
 SLOT=4.0.5
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz mirror://gentoo/genpatches-4.0-7.base.tar.xz mirror://gentoo/genpatches-4.0-7.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.0-7.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-4.0.4-2015-06-04.patch.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=437888285db742c5fc94cb7760647e30
diff --git a/metadata/md5-cache/sys-kernel/tuxonice-sources-4.0.6 b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.0.6
new file mode 100644
index 000000000000..a2eead880911
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/tuxonice-sources-4.0.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=TuxOnIce + Gentoo patchset sources
+EAPI=5
+HOMEPAGE=http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel
+IUSE=experimental symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+RDEPEND=>=sys-apps/tuxonice-userui-1.0 || ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils ) !build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.0.6
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz mirror://gentoo/genpatches-4.0-8.base.tar.xz mirror://gentoo/genpatches-4.0-8.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.0-8.experimental.tar.xz ) http://tuxonice.nigelcunningham.com.au/downloads/all/tuxonice-for-linux-4.0.5-2015-06-17.patch.bz2
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=181a3ac374b9749d96eb2add9d20cfd3
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.81 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.81
index a7df6cae33da..7f8b91fad435 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.81
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.10.81
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.10.81
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.10.81.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-3.10 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.10-gnu/deblob-check -> deblob-check-3.10 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dda93cbba60358d6dcea9ed06c842854
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.12.44 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.12.44
index 90798082fcb1..e2c54da613da 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.12.44
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.12.44
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.12.44
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.12.44.xz mirror://kernel/linux/kernel/v3.x/linux-3.12.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.12-gnu/deblob-3.12 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.12-gnu/deblob-check -> deblob-check-3.12 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=392a54a0e7a03f32dcfe617c44d4caff
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.14.45 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.14.45
index 1cd6a83f33ef..6d11a956e23c 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.14.45
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.14.45
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.14.45
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.14.45.xz mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-3.14 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.14-gnu/deblob-check -> deblob-check-3.14 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3b256a2191888f47db65751a2ff4b89f
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.18.16 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.18.16
index 1b3e92256137..c2d92bfc13df 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.18.16
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.18.16
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.18.16
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.16.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-3.18 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.18-gnu/deblob-check -> deblob-check-3.18 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0965b42daa8e06f93884dde99eb84e14
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.69 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.69
index 2fdc9ede47fc..fb3f5750e598 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.69
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.2.69
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.2.69
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.2.69.xz mirror://kernel/linux/kernel/v3.x/linux-3.2.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.2-gnu1/deblob-3.2 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.2-gnu1/deblob-check -> deblob-check-3.2 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=7cddf49ec70e7096a21a8541f3deb706
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.108 b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.108
index fbe90a944acd..1098b451c0c6 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.108
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-3.4.108
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=3.4.108
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.4.108.xz mirror://kernel/linux/kernel/v3.x/linux-3.4.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.4-gnu1/deblob-3.4 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/3.4-gnu1/deblob-check -> deblob-check-3.4 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=75451ec0ab38ae3b1614c2f522291a17
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.0.6 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.0.6
index 02812d1d6d43..40d5d28dfdb5 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.0.6
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.0.6
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.0.6
 SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.0.6.xz mirror://kernel/linux/kernel/v4.x/linux-4.0.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-4.0 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.0-gnu/deblob-check -> deblob-check-4.0 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e14b50c02d892bd16f2bff21f4392740
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.0 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.0
index 1547043e2668..e914a0a07ea2 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.0
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.1.0
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=4.1.0
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.1.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-4.1 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.1-gnu/deblob-check -> deblob-check-4.1 )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b4594d8533be6fe28262258c85bc64b7
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.0.36.32 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.0.36.32
index 5a2b2d03edd7..aa3e59dd9dae 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.0.36.32
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.0.36.32
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.0.36.32
 SRC_URI=mirror://kernel/linux/kernel/v2.6/linux-2.6.35.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.35-gnu/deblob-2.6.35 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/2.6.35-gnu/deblob-check -> deblob-check-2.6.35 ) mirror://gentoo/genpatches-2.6.35-9.base.tar.xz mirror://gentoo/genpatches-2.6.35-9.extras.tar.xz http://dev.gentoo.org/~hollow/distfiles/vserver-patches-2.6.35_2.3.0.36.32.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=fcc02e4d5ffaa8d8760f218d1f5f0f08
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.11 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.11
index 87fa313a4ba8..9156c60188ed 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.11
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.11
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.6.11
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.13.11.xz mirror://kernel/linux/kernel/v3.x/linux-3.13.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.13.11-vs2.3.6.11.diff
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=4316b79e25eb15f66706acd1503ee2fc
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.14 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.14
index ff7df1241299..7bcb4aebf2bf 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.14
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.14
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.6.14
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.14.27.xz mirror://kernel/linux/kernel/v3.x/linux-3.14.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.14.27-vs2.3.6.14.diff
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c95a7782ff648dd346f344f8ba24c274
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.5 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.5
index a6516e8b0af3..805790a9c3bb 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.5
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.5
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.6.5
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.9.10.xz mirror://kernel/linux/kernel/v3.x/linux-3.9.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.9.10-vs2.3.6.5.diff
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f24852dded17feb09d759e5538ec59bf
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.8 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.8
index 78bb02607c18..7aabed8f1cac 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.8
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.6.8
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.6.8
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.10.40.xz mirror://kernel/linux/kernel/v3.x/linux-3.10.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.10.40-vs2.3.6.8.diff
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e434421c9381fd0d11fa7dfbbe7530a6
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.7.3 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.7.3
index 06b2a392cbd7..e26904c0bafa 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.7.3
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.7.3
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.7.3
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.5.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.18.5-vs2.3.7.3.diff
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0aa83cb7879b4ea68c6e19f983b83838
diff --git a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.7.4 b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.7.4
index abd986811900..edc452389fb3 100644
--- a/metadata/md5-cache/sys-kernel/vserver-sources-2.3.7.4
+++ b/metadata/md5-cache/sys-kernel/vserver-sources-2.3.7.4
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.3.7.4
 SRC_URI=mirror://kernel/linux/kernel/v3.x/patch-3.18.7.xz mirror://kernel/linux/kernel/v3.x/linux-3.18.tar.xz http://vserver.13thfloor.at/Experimental/patch-3.18.7-vs2.3.7.4.diff
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1a6fb8427823fb5797ca435ead4ac12a
diff --git a/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26 b/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
index e127f3ed9e71..5c98aa76f53f 100644
--- a/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
+++ b/metadata/md5-cache/sys-kernel/xbox-sources-2.6.16.26
@@ -10,5 +10,5 @@ RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/
 RESTRICT=binchecks strip
 SLOT=2.6.16.26
 SRC_URI=mirror://kernel/linux/kernel/v2.6/patch-2.6.16.26.xz mirror://kernel/linux/kernel/v2.6/linux-2.6.16.tar.xz mirror://sourceforge/xbox-linux/linux-2.6.16-xbox.patch.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=b65eab898b45b22ff548684b94a6c882
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-3.10.9999 b/metadata/md5-cache/sys-kernel/zen-sources-3.10.9999
index 4ef2ea3df9cc..d8cc153e8834 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-3.10.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-3.10.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.10.9999
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=74a1f279f1382f2650452686230919c9
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-3.11.9999 b/metadata/md5-cache/sys-kernel/zen-sources-3.11.9999
index d0499148d21a..40fd09957355 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-3.11.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-3.11.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.11.9999
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=95b897e2467ab99961045ab11dea1301
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-3.12.9999 b/metadata/md5-cache/sys-kernel/zen-sources-3.12.9999
index 275604f9f280..df523f076727 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-3.12.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-3.12.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.12.9999
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=f29ee6a7d3a000d6f8a7e4d7768c0c42
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-3.13.9999 b/metadata/md5-cache/sys-kernel/zen-sources-3.13.9999
index 09098289b401..81b5ab4fb13b 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-3.13.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-3.13.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.13.9999
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=0ba96fb1eaebf0cfb625de17b2f90959
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-3.8.9999 b/metadata/md5-cache/sys-kernel/zen-sources-3.8.9999
index 457cc5f6ffc1..2e491eeb4e20 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-3.8.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-3.8.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.8.9999
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1d1595b0d86db6e36b790901026e751b
diff --git a/metadata/md5-cache/sys-kernel/zen-sources-3.9.9999 b/metadata/md5-cache/sys-kernel/zen-sources-3.9.9999
index 6778191f45bc..5ee9b72745c0 100644
--- a/metadata/md5-cache/sys-kernel/zen-sources-3.9.9999
+++ b/metadata/md5-cache/sys-kernel/zen-sources-3.9.9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2 freedist
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=3.9.9999
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	4da0de8e87de8d48f4576790a3034be2	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	kernel-2	91e477d84afcf7f0e0441eeea2b26bbc	multilib	62927b3db3a589b0806255f3a002d5d3	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e831f162877d41f34ff1d43dc973347b
diff --git a/metadata/md5-cache/sys-libs/cracklib-2.9.1-r1 b/metadata/md5-cache/sys-libs/cracklib-2.9.1-r1
index d1eab1a7d060..e46dbe7d0a5d 100644
--- a/metadata/md5-cache/sys-libs/cracklib-2.9.1-r1
+++ b/metadata/md5-cache/sys-libs/cracklib-2.9.1-r1
@@ -9,5 +9,5 @@ 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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r6 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/cracklib/cracklib-2.9.1.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=3449417eedbef08697936b3d66ef8606
diff --git a/metadata/md5-cache/sys-libs/cracklib-2.9.2-r1 b/metadata/md5-cache/sys-libs/cracklib-2.9.2-r1
index 0b713641c2f0..5269e4825b9a 100644
--- a/metadata/md5-cache/sys-libs/cracklib-2.9.2-r1
+++ b/metadata/md5-cache/sys-libs/cracklib-2.9.2-r1
@@ -9,5 +9,5 @@ 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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r6 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/cracklib/cracklib-2.9.2.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=cdcf98317741341632f6502be6b388a6
diff --git a/metadata/md5-cache/sys-libs/cracklib-2.9.3 b/metadata/md5-cache/sys-libs/cracklib-2.9.3
index aa726344faad..70049c399674 100644
--- a/metadata/md5-cache/sys-libs/cracklib-2.9.3
+++ b/metadata/md5-cache/sys-libs/cracklib-2.9.3
@@ -9,5 +9,5 @@ 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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r6 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/cracklib/cracklib-2.9.3.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4a0b70bb028c84812b08018f10d794a2
diff --git a/metadata/md5-cache/sys-libs/cracklib-2.9.4 b/metadata/md5-cache/sys-libs/cracklib-2.9.4
index 43bd9d276548..8cc5ad71e2e3 100644
--- a/metadata/md5-cache/sys-libs/cracklib-2.9.4
+++ b/metadata/md5-cache/sys-libs/cracklib-2.9.4
@@ -9,5 +9,5 @@ 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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r6 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/cracklib/cracklib-2.9.4.tar.gz
-_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=9ca0e95b3920c02e64eca05c62440753
diff --git a/metadata/md5-cache/sys-libs/db-4.8.30-r1 b/metadata/md5-cache/sys-libs/db-4.8.30-r1
index 0f3a087c7fa8..c58aa660a9c4 100644
--- a/metadata/md5-cache/sys-libs/db-4.8.30-r1
+++ b/metadata/md5-cache/sys-libs/db-4.8.30-r1
@@ -9,5 +9,5 @@ LICENSE=Sleepycat
 RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1: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(-)?] ) java? ( >=virtual/jre-1.5 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r2 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=4.8
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.8.30.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c140074bcb97d9beac3d18e89d34b848
diff --git a/metadata/md5-cache/sys-libs/db-4.8.30-r2 b/metadata/md5-cache/sys-libs/db-4.8.30-r2
index e513a65197ae..f1effb59e6c9 100644
--- a/metadata/md5-cache/sys-libs/db-4.8.30-r2
+++ b/metadata/md5-cache/sys-libs/db-4.8.30-r2
@@ -10,5 +10,5 @@ RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=test? ( tcl )
 SLOT=4.8
 SRC_URI=http://download.oracle.com/berkeley-db/db-4.8.30.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=084fd8a93b067a3a5c9027c1030f036f
diff --git a/metadata/md5-cache/sys-libs/db-5.3.28-r2 b/metadata/md5-cache/sys-libs/db-5.3.28-r2
index 720ccf147248..441346250a3e 100644
--- a/metadata/md5-cache/sys-libs/db-5.3.28-r2
+++ b/metadata/md5-cache/sys-libs/db-5.3.28-r2
@@ -10,5 +10,5 @@ RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=test? ( tcl )
 SLOT=5.3
 SRC_URI=http://download.oracle.com/berkeley-db/db-5.3.28.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=3ee6e8eb57438752214f0ac475c5b81a
diff --git a/metadata/md5-cache/sys-libs/db-6.0.30 b/metadata/md5-cache/sys-libs/db-6.0.30
index edd86fc57b95..9f514baf4183 100644
--- a/metadata/md5-cache/sys-libs/db-6.0.30
+++ b/metadata/md5-cache/sys-libs/db-6.0.30
@@ -9,5 +9,5 @@ LICENSE=AGPL-3
 RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1: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(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 )
 SLOT=6.0
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.0.30.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=9fa98212708b9bcb3eb8c3d682b9f675
diff --git a/metadata/md5-cache/sys-libs/db-6.0.30-r1 b/metadata/md5-cache/sys-libs/db-6.0.30-r1
index b73d2f1f5ab5..9ca69f691b48 100644
--- a/metadata/md5-cache/sys-libs/db-6.0.30-r1
+++ b/metadata/md5-cache/sys-libs/db-6.0.30-r1
@@ -10,5 +10,5 @@ RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=test? ( tcl )
 SLOT=6.0
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.0.30.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=820a1e6a44ad85ccadf77839199d9bd7
diff --git a/metadata/md5-cache/sys-libs/db-6.1.23 b/metadata/md5-cache/sys-libs/db-6.1.23
index 26ed6d57014d..608d47732e12 100644
--- a/metadata/md5-cache/sys-libs/db-6.1.23
+++ b/metadata/md5-cache/sys-libs/db-6.1.23
@@ -10,5 +10,5 @@ RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=test? ( tcl )
 SLOT=6.1
 SRC_URI=http://download.oracle.com/berkeley-db/db-6.1.23.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=276622f4e9fb9e440cc300723266245d
diff --git a/metadata/md5-cache/sys-libs/db-6.1.19 b/metadata/md5-cache/sys-libs/db-6.1.26
similarity index 92%
rename from metadata/md5-cache/sys-libs/db-6.1.19
rename to metadata/md5-cache/sys-libs/db-6.1.26
index f3050ba5df01..bff366ccc5ae 100644
--- a/metadata/md5-cache/sys-libs/db-6.1.19
+++ b/metadata/md5-cache/sys-libs/db-6.1.26
@@ -9,6 +9,6 @@ LICENSE=AGPL-3
 RDEPEND=tcl? ( >=dev-lang/tcl-8.5.15-r1: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(-)?] ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.2.0 )
 REQUIRED_USE=test? ( tcl )
 SLOT=6.1
-SRC_URI=http://download.oracle.com/berkeley-db/db-6.1.19.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=33461e692b13965d40e21da9e503b176
+SRC_URI=http://download.oracle.com/berkeley-db/db-6.1.26.tar.gz
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	db	217d1394b8ade73a6a416da2b3be3332	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	6627198e505d021534cb20f89279c509	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=6e089d5d6aa294db7b66fd14bf3ec2ee
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.10 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.10
index 8541d0935a34..d90869102b4f 100644
--- a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.10
+++ b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.10
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.42.10.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d4a6144aa311d7766f63d7be8d584796
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.12 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.12
index fe856ac478e9..1af327cd8ff4 100644
--- a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.12
+++ b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.12
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.42.12.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=9f4a692c305e6ebd6009e64cf382635c
diff --git a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.13 b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.13
index d362f880a74a..3451179315fd 100644
--- a/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.13
+++ b/metadata/md5-cache/sys-libs/e2fsprogs-libs-1.42.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!sys-libs/com_err !sys-libs/ss !<sys-fs/e2fsprogs-1.41.8 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/e2fsprogs/e2fsprogs-libs-1.42.13.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=3116936faefbabbd0bc69c6b299069e8
diff --git a/metadata/md5-cache/sys-libs/gdbm-1.10-r1 b/metadata/md5-cache/sys-libs/gdbm-1.10-r1
index 9262d829647b..41c99d765491 100644
--- a/metadata/md5-cache/sys-libs/gdbm-1.10-r1
+++ b/metadata/md5-cache/sys-libs/gdbm-1.10-r1
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/gdbm/gdbm-1.10.tar.gz exporter? ( mirror://gnu/gdbm/gdbm-1.8.3.tar.gz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=81c403877e02ea3a2d50b54a70a2afc0
diff --git a/metadata/md5-cache/sys-libs/gdbm-1.11 b/metadata/md5-cache/sys-libs/gdbm-1.11
index 8fdf55ffe007..fc83a59e64cc 100644
--- a/metadata/md5-cache/sys-libs/gdbm-1.11
+++ b/metadata/md5-cache/sys-libs/gdbm-1.11
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnu/gdbm/gdbm-1.11.tar.gz exporter? ( mirror://gnu/gdbm/gdbm-1.8.3.tar.gz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c6d3e8e3a5ebedd815279d91dd734c88
diff --git a/metadata/md5-cache/sys-libs/gpm-1.20.7-r2 b/metadata/md5-cache/sys-libs/gpm-1.20.7-r2
index 7b859d212f5d..9f5db35cee73 100644
--- a/metadata/md5-cache/sys-libs/gpm-1.20.7-r2
+++ b/metadata/md5-cache/sys-libs/gpm-1.20.7-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.9-r3[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(-)?] selinux? ( sec-policy/selinux-gpm ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.nico.schottelius.org/software/gpm/archives/gpm-1.20.7.tar.lzma
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b4649a1dd89b1955b8be073a02052e54
diff --git a/metadata/md5-cache/sys-libs/libavc1394-0.5.4-r1 b/metadata/md5-cache/sys-libs/libavc1394-0.5.4-r1
index bd9b43932160..ae08b211ded3 100644
--- a/metadata/md5-cache/sys-libs/libavc1394-0.5.4-r1
+++ b/metadata/md5-cache/sys-libs/libavc1394-0.5.4-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-libs/libraw1394-2.1.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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://sourceforge/libavc1394/libavc1394-0.5.4.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=117d45bfee3cf0e086ef0d86146eba4e
diff --git a/metadata/md5-cache/sys-libs/libcap-2.22-r2 b/metadata/md5-cache/sys-libs/libcap-2.22-r2
index eb555f466ea2..81aa4b83457b 100644
--- a/metadata/md5-cache/sys-libs/libcap-2.22-r2
+++ b/metadata/md5-cache/sys-libs/libcap-2.22-r2
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BSD )
 RDEPEND=>=sys-apps/attr-2.4.47-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(-)?] pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://gentoo/libcap-2.22.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=79c0e2f3eb41fa2bff76b92861615a68
diff --git a/metadata/md5-cache/sys-libs/libcap-2.24 b/metadata/md5-cache/sys-libs/libcap-2.24
index c83ad76b61bc..405478288375 100644
--- a/metadata/md5-cache/sys-libs/libcap-2.24
+++ b/metadata/md5-cache/sys-libs/libcap-2.24
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BSD )
 RDEPEND=>=sys-apps/attr-2.4.47-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(-)?] pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://kernel/linux/libs/security/linux-privs/libcap2/libcap-2.24.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d5a88639fec39f3f0d9fac4618f50237
diff --git a/metadata/md5-cache/sys-libs/libcap-2.24-r1 b/metadata/md5-cache/sys-libs/libcap-2.24-r1
index aa9d94b9d7e8..e0a34e9abcd7 100644
--- a/metadata/md5-cache/sys-libs/libcap-2.24-r1
+++ b/metadata/md5-cache/sys-libs/libcap-2.24-r1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 BSD )
 RDEPEND=>=sys-apps/attr-2.4.47-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(-)?] pam? ( virtual/pam )
 SLOT=0
 SRC_URI=mirror://kernel/linux/libs/security/linux-privs/libcap2/libcap-2.24.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=59415310ae34e53814be21ad7422c068
diff --git a/metadata/md5-cache/sys-libs/libcxx-0.0_p20130725 b/metadata/md5-cache/sys-libs/libcxx-0.0_p20130725
index 0bf1552faf0c..0845f0848b13 100644
--- a/metadata/md5-cache/sys-libs/libcxx-0.0_p20130725
+++ b/metadata/md5-cache/sys-libs/libcxx-0.0_p20130725
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130725[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(-)?] ) !libcxxrt? ( >=sys-devel/gcc-4.7[cxx] )
 SLOT=0
 SRC_URI=mirror://gentoo/libcxx-0.0_p20130725.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=90f6474d4b18e3b4a2116f8c78908b52
diff --git a/metadata/md5-cache/sys-libs/libcxx-0.0_p20131222 b/metadata/md5-cache/sys-libs/libcxx-0.0_p20131222
index fa6c4aaa0cac..3ead50e2b548 100644
--- a/metadata/md5-cache/sys-libs/libcxx-0.0_p20131222
+++ b/metadata/md5-cache/sys-libs/libcxx-0.0_p20131222
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130725[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(-)?] ) !libcxxrt? ( >=sys-devel/gcc-4.7[cxx] )
 SLOT=0
 SRC_URI=mirror://gentoo/libcxx-0.0_p20131222.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1997b5c118cda7bf70e651bcfdcc1639
diff --git a/metadata/md5-cache/sys-libs/libcxx-0.0_p20140322 b/metadata/md5-cache/sys-libs/libcxx-0.0_p20140322
index 54d282cc1adf..2ac3c2f67051 100644
--- a/metadata/md5-cache/sys-libs/libcxx-0.0_p20140322
+++ b/metadata/md5-cache/sys-libs/libcxx-0.0_p20140322
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130725[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(-)?] ) !libcxxrt? ( >=sys-devel/gcc-4.7[cxx] )
 SLOT=0
 SRC_URI=mirror://gentoo/libcxx-0.0_p20140322.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2d6236d9d47b9c9978c80398d12c04a6
diff --git a/metadata/md5-cache/sys-libs/libcxx-3.6.0 b/metadata/md5-cache/sys-libs/libcxx-3.6.0
index d8e1a4d02546..10a74865ecc3 100644
--- a/metadata/md5-cache/sys-libs/libcxx-3.6.0
+++ b/metadata/md5-cache/sys-libs/libcxx-3.6.0
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130725[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(-)?] ) !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] )
 SLOT=0
 SRC_URI=http://llvm.org/releases/3.6.0/libcxx-3.6.0.src.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=caddd3f33adbdc930e0b5d58f167a610
diff --git a/metadata/md5-cache/sys-libs/libcxx-3.6.1 b/metadata/md5-cache/sys-libs/libcxx-3.6.1
index 92fc77891b36..231149d9333a 100644
--- a/metadata/md5-cache/sys-libs/libcxx-3.6.1
+++ b/metadata/md5-cache/sys-libs/libcxx-3.6.1
@@ -9,5 +9,5 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130725[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(-)?] ) !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] )
 SLOT=0
 SRC_URI=http://llvm.org/releases/3.6.1/libcxx-3.6.1.src.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c8785a951377136347ee9a0d8cd745f3
diff --git a/metadata/md5-cache/sys-libs/libcxx-9999 b/metadata/md5-cache/sys-libs/libcxx-9999
index a4eb934b1e90..0ac72b445270 100644
--- a/metadata/md5-cache/sys-libs/libcxx-9999
+++ b/metadata/md5-cache/sys-libs/libcxx-9999
@@ -7,5 +7,5 @@ IUSE=elibc_glibc +libcxxrt +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 a
 LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=libcxxrt? ( >=sys-libs/libcxxrt-0.0_p20130725[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(-)?] ) !libcxxrt? ( >=sys-devel/gcc-4.7:=[cxx] )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	subversion	c12bdf4fcc82f86ad89b14c8f76c4026	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=203d2f50068bae9d6db2f9afbaa55f2f
diff --git a/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20140322 b/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20140322
index b295e744db12..5a0f0c3d8b62 100644
--- a/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20140322
+++ b/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20140322
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=libunwind? ( >=sys-libs/libunwind-1.0.1-r1[static-libs?] )
 SLOT=0
 SRC_URI=mirror://gentoo/libcxxrt-0.0_p20140322.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f05c1c8643a887e336c2de832e102535
diff --git a/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20150423 b/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20150423
index 63093a5c5308..f42543595ddb 100644
--- a/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20150423
+++ b/metadata/md5-cache/sys-libs/libcxxrt-0.0_p20150423
@@ -9,5 +9,5 @@ LICENSE=BSD-2
 RDEPEND=libunwind? ( >=sys-libs/libunwind-1.0.1-r1[static-libs?] )
 SLOT=0
 SRC_URI=mirror://gentoo/libcxxrt-0.0_p20150423.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=effbc269ef892a5eeb822dde6d69fce9
diff --git a/metadata/md5-cache/sys-libs/libcxxrt-9999 b/metadata/md5-cache/sys-libs/libcxxrt-9999
index a38135edfe51..e863db44c0f0 100644
--- a/metadata/md5-cache/sys-libs/libcxxrt-9999
+++ b/metadata/md5-cache/sys-libs/libcxxrt-9999
@@ -7,5 +7,5 @@ IUSE=libunwind +static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_m
 LICENSE=BSD-2
 RDEPEND=libunwind? ( >=sys-libs/libunwind-1.0.1-r1[static-libs?] )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-2	e28f0d8a9b321431b1e699782851b827	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	portability	a45c088f246ef5091e029f6285d7ce42	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6976566608ddbb392de9128d30210007
diff --git a/metadata/md5-cache/sys-libs/libieee1284-0.2.11-r3 b/metadata/md5-cache/sys-libs/libieee1284-0.2.11-r3
index 3faad0ecb437..41a064daa5bd 100644
--- a/metadata/md5-cache/sys-libs/libieee1284-0.2.11-r3
+++ b/metadata/md5-cache/sys-libs/libieee1284-0.2.11-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r9 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) python? ( =dev-lang/python-2* )
 SLOT=0
 SRC_URI=mirror://sourceforge/libieee1284/libieee1284-0.2.11.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python	3a270b7b1d1e679847ff0faeac25c5a3	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=eab66c8ac7abfe03ed39ca8be406b3ec
diff --git a/metadata/md5-cache/sys-libs/libraw1394-2.1.0-r1 b/metadata/md5-cache/sys-libs/libraw1394-2.1.0-r1
index adab61542674..bc91524156fe 100644
--- a/metadata/md5-cache/sys-libs/libraw1394-2.1.0-r1
+++ b/metadata/md5-cache/sys-libs/libraw1394-2.1.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://kernel/linux/libs/ieee1394/libraw1394-2.1.0.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ec4cd3285d13e7160169dea40a4d6dc1
diff --git a/metadata/md5-cache/sys-libs/libraw1394-2.1.1 b/metadata/md5-cache/sys-libs/libraw1394-2.1.1
index 64432d5688f6..54f1f3c0c097 100644
--- a/metadata/md5-cache/sys-libs/libraw1394-2.1.1
+++ b/metadata/md5-cache/sys-libs/libraw1394-2.1.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://kernel/linux/libs/ieee1394/libraw1394-2.1.1.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ba5c4eea300bc7eac9d9e3507b69e5a6
diff --git a/metadata/md5-cache/sys-libs/libseccomp-2.2.0 b/metadata/md5-cache/sys-libs/libseccomp-2.2.0
index ea0ce78ba698..8c5bbdac570d 100644
--- a/metadata/md5-cache/sys-libs/libseccomp-2.2.0
+++ b/metadata/md5-cache/sys-libs/libseccomp-2.2.0
@@ -8,5 +8,5 @@ KEYWORDS=-* ~amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=https://github.com/seccomp/libseccomp/releases/download/v2.2.0/libseccomp-2.2.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=fa711ae40346dce782917a3886a96003
diff --git a/metadata/md5-cache/sys-libs/libselinux-2.2.2-r5 b/metadata/md5-cache/sys-libs/libselinux-2.2.2-r5
index 17af6621a539..a091e128e3c6 100644
--- a/metadata/md5-cache/sys-libs/libselinux-2.2.2-r5
+++ b/metadata/md5-cache/sys-libs/libselinux-2.2.2-r5
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=sys-libs/libsepol-2.2 >=dev-libs/libpcre-8.30-r2[static-libs?] 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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] )
 SLOT=0
 SRC_URI=http://userspace.selinuxproject.org/releases/20131030/libselinux-2.2.2.tar.gz http://dev.gentoo.org/~swift/patches/libselinux/patchbundle-libselinux-2.2.2-r5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a535c8830dc88a769f3627aa0ea71aa0
diff --git a/metadata/md5-cache/sys-libs/libselinux-2.3-r2 b/metadata/md5-cache/sys-libs/libselinux-2.3-r2
index 81e7246748b5..27481fc4e2e8 100644
--- a/metadata/md5-cache/sys-libs/libselinux-2.3-r2
+++ b/metadata/md5-cache/sys-libs/libselinux-2.3-r2
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=sys-libs/libsepol-2.3[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(-)?] >=dev-libs/libpcre-8.33-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(-)?] 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(-)] ) ruby? ( ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) )
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/libselinux-2.3.tar.gz http://dev.gentoo.org/~swift/patches/libselinux/patchbundle-libselinux-4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b74cf9adfcc10aa2d80e03a78052b35b
diff --git a/metadata/md5-cache/sys-libs/libselinux-2.4 b/metadata/md5-cache/sys-libs/libselinux-2.4
index 424f02e2fabf..908c48d205f8 100644
--- a/metadata/md5-cache/sys-libs/libselinux-2.4
+++ b/metadata/md5-cache/sys-libs/libselinux-2.4
@@ -9,5 +9,5 @@ LICENSE=public-domain
 RDEPEND=>=sys-libs/libsepol-2.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(-)?] >=dev-libs/libpcre-8.33-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(-)?] 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(-)] ) ruby? ( ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) )
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20150202/libselinux-2.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=62413a029dcc23d8e942cf900647d4a3
diff --git a/metadata/md5-cache/sys-libs/libselinux-9999 b/metadata/md5-cache/sys-libs/libselinux-9999
index 2e4357e8e207..99fea9a62bb3 100644
--- a/metadata/md5-cache/sys-libs/libselinux-9999
+++ b/metadata/md5-cache/sys-libs/libselinux-9999
@@ -7,5 +7,5 @@ IUSE=python ruby static-libs ruby_targets_ruby19 ruby_targets_ruby20 python_targ
 LICENSE=public-domain
 RDEPEND=>=sys-libs/libsepol-9999[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(-)?] >=dev-libs/libpcre-8.33-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(-)?] 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(-)] ) ruby? ( ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) )
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7d90fe5ffd45e9267cb4a1343a916e18
diff --git a/metadata/md5-cache/sys-libs/libsemanage-2.2-r2 b/metadata/md5-cache/sys-libs/libsemanage-2.2-r2
index 27a316c42942..f9f5505e5687 100644
--- a/metadata/md5-cache/sys-libs/libsemanage-2.2-r2
+++ b/metadata/md5-cache/sys-libs/libsemanage-2.2-r2
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/libsepol-2.2 >=sys-libs/libselinux-2.2.2-r1 dev-libs/ustr sys
 RESTRICT=test
 SLOT=0
 SRC_URI=http://userspace.selinuxproject.org/releases/20131030/libsemanage-2.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a152964c87ace4bf28d2671862e4f8ff
diff --git a/metadata/md5-cache/sys-libs/libsemanage-2.3-r4 b/metadata/md5-cache/sys-libs/libsemanage-2.3-r4
index ec50a0409958..0e96aaf80ef9 100644
--- a/metadata/md5-cache/sys-libs/libsemanage-2.3-r4
+++ b/metadata/md5-cache/sys-libs/libsemanage-2.3-r4
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/libsepol-2.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 RESTRICT=test
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/libsemanage-2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=96acef1f47f39f6b269c801e5fac3660
diff --git a/metadata/md5-cache/sys-libs/libsemanage-2.4-r1 b/metadata/md5-cache/sys-libs/libsemanage-2.4-r1
index 05eaf7bbd421..8c19695cef40 100644
--- a/metadata/md5-cache/sys-libs/libsemanage-2.4-r1
+++ b/metadata/md5-cache/sys-libs/libsemanage-2.4-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/libsepol-2.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 RESTRICT=test
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20150202/libsemanage-2.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b1665ea83bf49803d40800063afa9f4a
diff --git a/metadata/md5-cache/sys-libs/libsemanage-9999 b/metadata/md5-cache/sys-libs/libsemanage-9999
index d9180243355c..df25ffefac61 100644
--- a/metadata/md5-cache/sys-libs/libsemanage-9999
+++ b/metadata/md5-cache/sys-libs/libsemanage-9999
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/libsepol-9999[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(-)?] >=sys-libs/libselinux-9999[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(-)?] >=sys-process/audit-2.2.2[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(-)?] >=dev-libs/ustr-1.0.4-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(-)?]
 RESTRICT=test
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=96e404c608fd630344d0ce20ded283e0
diff --git a/metadata/md5-cache/sys-libs/libsepol-2.2 b/metadata/md5-cache/sys-libs/libsepol-2.2
index ad75d73136b7..5ae7cc0810a2 100644
--- a/metadata/md5-cache/sys-libs/libsepol-2.2
+++ b/metadata/md5-cache/sys-libs/libsepol-2.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://userspace.selinuxproject.org/releases/20131030/libsepol-2.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=809a346935bd071bca61da991759e950
diff --git a/metadata/md5-cache/sys-libs/libsepol-2.3 b/metadata/md5-cache/sys-libs/libsepol-2.3
index 722338d308d2..234684afe8e1 100644
--- a/metadata/md5-cache/sys-libs/libsepol-2.3
+++ b/metadata/md5-cache/sys-libs/libsepol-2.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20140506/libsepol-2.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=9f09a2cf56396b6e2ed6a6109c9a0eea
diff --git a/metadata/md5-cache/sys-libs/libsepol-2.4 b/metadata/md5-cache/sys-libs/libsepol-2.4
index ab04ad11ee72..47e2c3f1a860 100644
--- a/metadata/md5-cache/sys-libs/libsepol-2.4
+++ b/metadata/md5-cache/sys-libs/libsepol-2.4
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20150202/libsepol-2.4.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c80ad4b28861693eec0ad6380a2dee00
diff --git a/metadata/md5-cache/sys-libs/libsepol-9999 b/metadata/md5-cache/sys-libs/libsepol-9999
index b06e76b7fd77..e3a6fd8386ff 100644
--- a/metadata/md5-cache/sys-libs/libsepol-9999
+++ b/metadata/md5-cache/sys-libs/libsepol-9999
@@ -7,5 +7,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	git-r3	ab80045e5d080584334f33013f4df21d	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=bb44073aab43594e37db5b11d5173e9a
diff --git a/metadata/md5-cache/sys-libs/ncurses-5.9-r3 b/metadata/md5-cache/sys-libs/ncurses-5.9-r3
index 2702989c3e64..c1522f576b42 100644
--- a/metadata/md5-cache/sys-libs/ncurses-5.9-r3
+++ b/metadata/md5-cache/sys-libs/ncurses-5.9-r3
@@ -10,5 +10,5 @@ PDEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 RDEPEND=gpm? ( sys-libs/gpm ) !<x11-terms/rxvt-unicode-9.06-r3 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=5
 SRC_URI=mirror://gnu/ncurses/ncurses-5.9.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=62d8d00924d6c64ca4d25b89e04eedb7
diff --git a/metadata/md5-cache/sys-libs/ncurses-5.9-r4 b/metadata/md5-cache/sys-libs/ncurses-5.9-r4
index dfa2ad65015e..ddf19ffdc270 100644
--- a/metadata/md5-cache/sys-libs/ncurses-5.9-r4
+++ b/metadata/md5-cache/sys-libs/ncurses-5.9-r4
@@ -10,5 +10,5 @@ PDEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 RDEPEND=gpm? ( sys-libs/gpm ) !<x11-terms/rxvt-unicode-9.06-r3 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r12 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=5
 SRC_URI=mirror://gnu/ncurses/ncurses-5.9.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=0f76ad624747c868ad80cf9d2ddc3578
diff --git a/metadata/md5-cache/sys-libs/nss_wrapper-1.0.3 b/metadata/md5-cache/sys-libs/nss_wrapper-1.0.3
index fd409c8b4fd7..01c30ee0876a 100644
--- a/metadata/md5-cache/sys-libs/nss_wrapper-1.0.3
+++ b/metadata/md5-cache/sys-libs/nss_wrapper-1.0.3
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 SLOT=0
 SRC_URI=ftp://ftp.samba.org/pub/cwrap/nss_wrapper-1.0.3.tar.gz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ac4d9ee60f7e4e770e893eecde6f6fcc
diff --git a/metadata/md5-cache/sys-libs/ntdb-1.0-r1 b/metadata/md5-cache/sys-libs/ntdb-1.0-r1
index ecde62b54897..3434be13fbf7 100644
--- a/metadata/md5-cache/sys-libs/ntdb-1.0-r1
+++ b/metadata/md5-cache/sys-libs/ntdb-1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] >=dev-lang/python-e
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://samba.org/ftp/tdb/ntdb-1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
 _md5_=552627f58743d93ab8f464e9e7038b97
diff --git a/metadata/md5-cache/sys-libs/pam-1.1.8-r2 b/metadata/md5-cache/sys-libs/pam-1.1.8-r2
index db2c10001114..4d4403ff2fd2 100644
--- a/metadata/md5-cache/sys-libs/pam-1.1.8-r2
+++ b/metadata/md5-cache/sys-libs/pam-1.1.8-r2
@@ -10,5 +10,5 @@ PDEPEND=sys-auth/pambase vim-syntax? ( app-vim/pam-syntax )
 RDEPEND=nls? ( >=virtual/libintl-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(-)?] ) cracklib? ( >=sys-libs/cracklib-2.9.1-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(-)?] ) audit? ( >=sys-process/audit-2.2.2[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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[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(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) elibc_glibc? ( >=sys-libs/glibc-2.7 nis? ( || ( >=net-libs/libtirpc-0.2.4-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(-)?] <sys-libs/glibc-2.14 ) ) ) !<sys-apps/openrc-0.11.8 !sys-auth/openpam !sys-auth/pam_userdb abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.linux-pam.org/library/Linux-PAM-1.1.8.tar.bz2 http://www.linux-pam.org/documentation/Linux-PAM-1.1.8-docs.tar.bz2
-_eclasses_=db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=20b1e97f17c9633ccdb6fd1a6df21f0e
diff --git a/metadata/md5-cache/sys-libs/pam-1.1.8-r3 b/metadata/md5-cache/sys-libs/pam-1.1.8-r3
index 81863289b5d0..3a24150c5ffa 100644
--- a/metadata/md5-cache/sys-libs/pam-1.1.8-r3
+++ b/metadata/md5-cache/sys-libs/pam-1.1.8-r3
@@ -10,5 +10,5 @@ PDEPEND=sys-auth/pambase vim-syntax? ( app-vim/pam-syntax )
 RDEPEND=nls? ( >=virtual/libintl-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(-)?] ) cracklib? ( >=sys-libs/cracklib-2.9.1-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(-)?] ) audit? ( >=sys-process/audit-2.2.2[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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[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(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) nis? ( >=net-libs/libtirpc-0.2.4-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(-)?] ) !<sys-apps/openrc-0.11.8 !sys-auth/openpam !sys-auth/pam_userdb abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.linux-pam.org/library/Linux-PAM-1.1.8.tar.bz2 http://www.linux-pam.org/documentation/Linux-PAM-1.1.8-docs.tar.bz2
-_eclasses_=db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=296a3900690e26633cf7c8dabbacbc22
diff --git a/metadata/md5-cache/sys-libs/pam-1.2.0 b/metadata/md5-cache/sys-libs/pam-1.2.0
index 868782ea0876..dedde9cb122f 100644
--- a/metadata/md5-cache/sys-libs/pam-1.2.0
+++ b/metadata/md5-cache/sys-libs/pam-1.2.0
@@ -10,5 +10,5 @@ PDEPEND=sys-auth/pambase vim-syntax? ( app-vim/pam-syntax )
 RDEPEND=nls? ( >=virtual/libintl-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(-)?] ) cracklib? ( >=sys-libs/cracklib-2.9.1-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(-)?] ) audit? ( >=sys-process/audit-2.2.2[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(-)?] ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[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(-)?] ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) nis? ( >=net-libs/libtirpc-0.2.4-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(-)?] ) !<sys-apps/openrc-0.11.8 !sys-auth/openpam !sys-auth/pam_userdb abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.linux-pam.org/library/Linux-PAM-1.2.0.tar.bz2 http://www.linux-pam.org/documentation/Linux-PAM-1.2.0-docs.tar.bz2
-_eclasses_=db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=db-use	82d0e62839f20e1e0d5a2259abd5316f	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	pam	aa1ebb3ab720ea04dbbdd6eaaf9554ed	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6143d2bf1841b6bd32cb3bd6954de898
diff --git a/metadata/md5-cache/sys-libs/readline-6.2_p5-r1 b/metadata/md5-cache/sys-libs/readline-6.2_p5-r1
index b86df7641bfb..6e47f36bbaa9 100644
--- a/metadata/md5-cache/sys-libs/readline-6.2_p5-r1
+++ b/metadata/md5-cache/sys-libs/readline-6.2_p5-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.9-r3[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[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 )
 SLOT=0
 SRC_URI=mirror://gnu/readline/readline-6.2.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-001 ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-002 ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-003 ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-004 ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-005 mirror://gnu/readline/readline-6.2-patches/readline62-001 mirror://gnu/readline/readline-6.2-patches/readline62-002 mirror://gnu/readline/readline-6.2-patches/readline62-003 mirror://gnu/readline/readline-6.2-patches/readline62-004 mirror://gnu/readline/readline-6.2-patches/readline62-005
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=278996f998c95b7e303589e5ef12a5bb
diff --git a/metadata/md5-cache/sys-libs/readline-6.3_p8-r1 b/metadata/md5-cache/sys-libs/readline-6.3_p8-r1
index c7a2af464a4f..5c93788288cd 100644
--- a/metadata/md5-cache/sys-libs/readline-6.3_p8-r1
+++ b/metadata/md5-cache/sys-libs/readline-6.3_p8-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.9-r3[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[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 )
 SLOT=0
 SRC_URI=mirror://gnu/readline/readline-6.3.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-001 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-002 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-003 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-004 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-005 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-006 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-007 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-008 mirror://gnu/readline/readline-6.3-patches/readline63-001 mirror://gnu/readline/readline-6.3-patches/readline63-002 mirror://gnu/readline/readline-6.3-patches/readline63-003 mirror://gnu/readline/readline-6.3-patches/readline63-004 mirror://gnu/readline/readline-6.3-patches/readline63-005 mirror://gnu/readline/readline-6.3-patches/readline63-006 mirror://gnu/readline/readline-6.3-patches/readline63-007 mirror://gnu/readline/readline-6.3-patches/readline63-008
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4b3048576f8756d1838e5b92756974f8
diff --git a/metadata/md5-cache/sys-libs/readline-6.3_p8-r2 b/metadata/md5-cache/sys-libs/readline-6.3_p8-r2
index a980ddc3bd4e..6d58c584659f 100644
--- a/metadata/md5-cache/sys-libs/readline-6.3_p8-r2
+++ b/metadata/md5-cache/sys-libs/readline-6.3_p8-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.9-r3[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[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20131008-r7 )
 SLOT=0
 SRC_URI=mirror://gnu/readline/readline-6.3.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-001 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-002 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-003 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-004 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-005 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-006 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-007 ftp://ftp.cwru.edu/pub/bash/readline-6.3-patches/readline63-008 mirror://gnu/readline/readline-6.3-patches/readline63-001 mirror://gnu/readline/readline-6.3-patches/readline63-002 mirror://gnu/readline/readline-6.3-patches/readline63-003 mirror://gnu/readline/readline-6.3-patches/readline63-004 mirror://gnu/readline/readline-6.3-patches/readline63-005 mirror://gnu/readline/readline-6.3-patches/readline63-006 mirror://gnu/readline/readline-6.3-patches/readline63-007 mirror://gnu/readline/readline-6.3-patches/readline63-008
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=8d9ecaedf20760905100dc4375b27e92
diff --git a/metadata/md5-cache/sys-libs/slang-2.2.4-r1 b/metadata/md5-cache/sys-libs/slang-2.2.4-r1
index a47f539b067b..020265c1017e 100644
--- a/metadata/md5-cache/sys-libs/slang-2.2.4-r1
+++ b/metadata/md5-cache/sys-libs/slang-2.2.4-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses pcre? ( >=dev-libs/libpcre-8.33-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(-)?] ) png? ( >=media-libs/libpng-1.6.10: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(-)?] ) cjk? ( >=dev-libs/oniguruma-5.9.5[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-6.2_p5-r1: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(-)?] ) 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(-)?] ) abi_x86_32? ( !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-baselibs-20140406-r1 )
 SLOT=0
 SRC_URI=mirror://slang/v2.2/slang-2.2.4.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=08137a0c735988ece9ff317169c07bdf
diff --git a/metadata/md5-cache/sys-libs/talloc-2.1.0-r1 b/metadata/md5-cache/sys-libs/talloc-2.1.0-r1
index 784bf374ea3d..177b94a0ae63 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.1.0-r1
+++ b/metadata/md5-cache/sys-libs/talloc-2.1.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://samba.org/ftp/talloc/talloc-2.1.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
 _md5_=96a742fe012f658d454b83a86caccffb
diff --git a/metadata/md5-cache/sys-libs/talloc-2.1.1 b/metadata/md5-cache/sys-libs/talloc-2.1.1
index 19af62a4cb66..9d3f3b1e2741 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.1.1
+++ b/metadata/md5-cache/sys-libs/talloc-2.1.1
@@ -10,5 +10,5 @@ RDEPEND=python? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://samba.org/ftp/talloc/talloc-2.1.1.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
 _md5_=c5e375a75f95c065f8a7f4af7ae458fb
diff --git a/metadata/md5-cache/sys-libs/talloc-2.1.2 b/metadata/md5-cache/sys-libs/talloc-2.1.2
index afe0108db977..b13db39ccae4 100644
--- a/metadata/md5-cache/sys-libs/talloc-2.1.2
+++ b/metadata/md5-cache/sys-libs/talloc-2.1.2
@@ -10,5 +10,5 @@ RDEPEND=python? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://samba.org/ftp/talloc/talloc-2.1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
 _md5_=40f5220f7c38e04f942c6fbaa2756f02
diff --git a/metadata/md5-cache/sys-libs/tdb-1.3.0-r1 b/metadata/md5-cache/sys-libs/tdb-1.3.0-r1
index 50d823571152..9bcb965746a4 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.3.0-r1
+++ b/metadata/md5-cache/sys-libs/tdb-1.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=python? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://samba.org/ftp/tdb/tdb-1.3.0.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
 _md5_=9c4175470b83ff96c2759d71e71eb5e7
diff --git a/metadata/md5-cache/sys-libs/tdb-1.3.5 b/metadata/md5-cache/sys-libs/tdb-1.3.5
index 0f7943d6dff5..9cff4d66469e 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.3.5
+++ b/metadata/md5-cache/sys-libs/tdb-1.3.5
@@ -10,5 +10,5 @@ RDEPEND=python? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://samba.org/ftp/tdb/tdb-1.3.5.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
 _md5_=f3b6e72fa0350842b884270c883065a7
diff --git a/metadata/md5-cache/sys-libs/tdb-1.3.6 b/metadata/md5-cache/sys-libs/tdb-1.3.6
index 715ea12c05a4..1d95b9bd9348 100644
--- a/metadata/md5-cache/sys-libs/tdb-1.3.6
+++ b/metadata/md5-cache/sys-libs/tdb-1.3.6
@@ -10,5 +10,5 @@ RDEPEND=python? ( >=dev-lang/python-2.7.5-r2:2.7[threads] >=dev-lang/python-exec
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://samba.org/ftp/tdb/tdb-1.3.6.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
 _md5_=45ab5d3c5a6dd769978d4a71dc21f8bc
diff --git a/metadata/md5-cache/sys-libs/tevent-0.9.21-r1 b/metadata/md5-cache/sys-libs/tevent-0.9.21-r1
index 062d45652488..c53d7fc99201 100644
--- a/metadata/md5-cache/sys-libs/tevent-0.9.21-r1
+++ b/metadata/md5-cache/sys-libs/tevent-0.9.21-r1
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/talloc-2.1.0[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://samba.org/ftp/tevent/tevent-0.9.21.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
 _md5_=c02a6326ef39262178dbf6fb43d80e8d
diff --git a/metadata/md5-cache/sys-libs/tevent-0.9.24 b/metadata/md5-cache/sys-libs/tevent-0.9.24
index 6397f4ecea39..80b41644cc85 100644
--- a/metadata/md5-cache/sys-libs/tevent-0.9.24
+++ b/metadata/md5-cache/sys-libs/tevent-0.9.24
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/talloc-2.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://samba.org/ftp/tevent/tevent-0.9.24.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
 _md5_=da961818de84532f4123de3540897172
diff --git a/metadata/md5-cache/sys-libs/tevent-0.9.25 b/metadata/md5-cache/sys-libs/tevent-0.9.25
index a95d4c52cc8c..391963290a56 100644
--- a/metadata/md5-cache/sys-libs/tevent-0.9.25
+++ b/metadata/md5-cache/sys-libs/tevent-0.9.25
@@ -10,5 +10,5 @@ RDEPEND=>=sys-libs/talloc-2.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=http://samba.org/ftp/tevent/tevent-0.9.25.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	waf-utils	f8e7e7df15097b4ca1d9945c2653b783
 _md5_=f2c0e0fbf313f54143f9bd0fc5922b4b
diff --git a/metadata/md5-cache/sys-libs/uid_wrapper-1.1.0 b/metadata/md5-cache/sys-libs/uid_wrapper-1.1.0
index 351e6d6e0bb4..842ce0a1b610 100644
--- a/metadata/md5-cache/sys-libs/uid_wrapper-1.1.0
+++ b/metadata/md5-cache/sys-libs/uid_wrapper-1.1.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 SLOT=0
 SRC_URI=ftp://ftp.samba.org/pub/cwrap/uid_wrapper-1.1.0.tar.gz
-_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=56b0ec3b6f0079da2316635bf7c2f358
diff --git a/metadata/md5-cache/sys-libs/zlib-1.2.8-r1 b/metadata/md5-cache/sys-libs/zlib-1.2.8-r1
index cb4774d33861..3cadf12b7083 100644
--- a/metadata/md5-cache/sys-libs/zlib-1.2.8-r1
+++ b/metadata/md5-cache/sys-libs/zlib-1.2.8-r1
@@ -9,5 +9,5 @@ LICENSE=ZLIB
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<dev-libs/libxml2-2.7.7
 SLOT=0
 SRC_URI=http://zlib.net/zlib-1.2.8.tar.gz http://www.gzip.org/zlib/zlib-1.2.8.tar.gz http://www.zlib.net/current/beta/zlib-1.2.8.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=cf6ae02b0d70e5bd6d40d9fb2820d1ef
diff --git a/metadata/md5-cache/sys-process/audit-2.2.2-r2 b/metadata/md5-cache/sys-process/audit-2.2.2-r2
index 0e0554a50aae..8f90a60cad7f 100644
--- a/metadata/md5-cache/sys-process/audit-2.2.2-r2
+++ b/metadata/md5-cache/sys-process/audit-2.2.2-r2
@@ -10,5 +10,5 @@ RDEPEND=ldap? ( net-nds/openldap ) prelude? ( dev-libs/libprelude ) sys-libs/lib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://people.redhat.com/sgrubb/audit/audit-2.2.2.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c19b7bbc042c6b0064c893a00f6bfd4f
diff --git a/metadata/md5-cache/sys-process/audit-2.2.2-r3 b/metadata/md5-cache/sys-process/audit-2.2.2-r3
index f527d498d381..a8c4d77ed78e 100644
--- a/metadata/md5-cache/sys-process/audit-2.2.2-r3
+++ b/metadata/md5-cache/sys-process/audit-2.2.2-r3
@@ -10,5 +10,5 @@ RDEPEND=ldap? ( net-nds/openldap ) prelude? ( dev-libs/libprelude ) sys-libs/lib
 RESTRICT=test
 SLOT=0
 SRC_URI=http://people.redhat.com/sgrubb/audit/audit-2.2.2.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e7f2fe98a6caf2a7333a5582f1e555d2
diff --git a/metadata/md5-cache/sys-process/audit-2.4.1 b/metadata/md5-cache/sys-process/audit-2.4.1
index 7b13c2343fad..fec985daaffa 100644
--- a/metadata/md5-cache/sys-process/audit-2.4.1
+++ b/metadata/md5-cache/sys-process/audit-2.4.1
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://people.redhat.com/sgrubb/audit/audit-2.4.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=94fd6c78d5ba37e9f1ad5297dd35f171
diff --git a/metadata/md5-cache/sys-process/audit-2.4.1-r1 b/metadata/md5-cache/sys-process/audit-2.4.1-r1
index 90e24edf1cab..908d45bb6eac 100644
--- a/metadata/md5-cache/sys-process/audit-2.4.1-r1
+++ b/metadata/md5-cache/sys-process/audit-2.4.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://people.redhat.com/sgrubb/audit/audit-2.4.1.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	linux-info	8cbc678e083c23e4ad546ca6509cf304	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=338c7e1452332f2b7aaa386ecf07a027
diff --git a/metadata/md5-cache/sys-process/numactl-2.0.10-r1 b/metadata/md5-cache/sys-process/numactl-2.0.10-r1
index e2466aad42d8..807a87c4ee23 100644
--- a/metadata/md5-cache/sys-process/numactl-2.0.10-r1
+++ b/metadata/md5-cache/sys-process/numactl-2.0.10-r1
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 -arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://oss.sgi.com/www/projects/libnuma/download/numactl-2.0.10.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=793969bfad948f92c6425517c7d351fa
diff --git a/metadata/md5-cache/sys-process/numactl-2.0.10-r2 b/metadata/md5-cache/sys-process/numactl-2.0.10-r2
index c79c4d810d79..9054045916ee 100644
--- a/metadata/md5-cache/sys-process/numactl-2.0.10-r2
+++ b/metadata/md5-cache/sys-process/numactl-2.0.10-r2
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 -arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=ftp://oss.sgi.com/www/projects/libnuma/download/numactl-2.0.10.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=cd33e71215435276663bbf0e4c8978a4
diff --git a/metadata/md5-cache/virtual/acl-0-r2 b/metadata/md5-cache/virtual/acl-0-r2
index 95f9ffec1d90..7477ad50ddfb 100644
--- a/metadata/md5-cache/virtual/acl-0-r2
+++ b/metadata/md5-cache/virtual/acl-0-r2
@@ -5,5 +5,5 @@ IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux
 RDEPEND=kernel_linux? ( >=sys-apps/acl-2.2.52-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(-)?] ) kernel_FreeBSD? ( >=sys-freebsd/freebsd-lib-9.1-r10[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
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2fd1a1a22363f4f8158f7f8ff67f9482
diff --git a/metadata/md5-cache/virtual/fam-0-r1 b/metadata/md5-cache/virtual/fam-0-r1
index 7c4e6b303ae5..5c3eb78af71a 100644
--- a/metadata/md5-cache/virtual/fam-0-r1
+++ b/metadata/md5-cache/virtual/fam-0-r1
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( >=app-admin/gamin-0.1.10-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(-)?] >=app-admin/fam-2.7.0-r6[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
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7003887ca9c7b9bbe9a7b5c78e0b5217
diff --git a/metadata/md5-cache/virtual/ffmpeg-9-r1 b/metadata/md5-cache/virtual/ffmpeg-9-r1
index 0adacd8599ec..48724e76218a 100644
--- a/metadata/md5-cache/virtual/ffmpeg-9-r1
+++ b/metadata/md5-cache/virtual/ffmpeg-9-r1
@@ -5,5 +5,5 @@ IUSE=X +encode gsm jpeg2k mp3 opus sdl speex theora threads truetype vaapi vdpau
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 RDEPEND=|| ( >=media-video/libav-9.12[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(-)?,X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] >=media-video/ffmpeg-1.2.6-r1: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(-)?,X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] )
 SLOT=0
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=58bda74a91c89a2d5507706e552db686
diff --git a/metadata/md5-cache/virtual/ffmpeg-9-r2 b/metadata/md5-cache/virtual/ffmpeg-9-r2
index 42cbce757cd6..dd7b1e6262ca 100644
--- a/metadata/md5-cache/virtual/ffmpeg-9-r2
+++ b/metadata/md5-cache/virtual/ffmpeg-9-r2
@@ -5,5 +5,5 @@ IUSE=X +encode gsm jpeg2k libav mp3 opus sdl speex theora threads truetype vaapi
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
 RDEPEND=libav? ( >=media-video/libav-9.12[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(-)?,X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] ) !libav? ( >=media-video/ffmpeg-1.2.6-r1: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(-)?,X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] )
 SLOT=0
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=426ac9d3ed6fdda79eec337ae465a862
diff --git a/metadata/md5-cache/virtual/glu-9.0-r1 b/metadata/md5-cache/virtual/glu-9.0-r1
index 29cf46206448..ce304c3bb7aa 100644
--- a/metadata/md5-cache/virtual/glu-9.0-r1
+++ b/metadata/md5-cache/virtual/glu-9.0-r1
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( >=media-libs/glu-9.0.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(-)?] media-libs/opengl-apple )
 SLOT=0
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6bbe8cb35c201ab3b14a8ea958d3b5cd
diff --git a/metadata/md5-cache/virtual/jpeg-0-r2 b/metadata/md5-cache/virtual/jpeg-0-r2
index de987b407e8a..e813cf05618a 100644
--- a/metadata/md5-cache/virtual/jpeg-0-r2
+++ b/metadata/md5-cache/virtual/jpeg-0-r2
@@ -5,5 +5,5 @@ IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( >=media-libs/libjpeg-turbo-1.3.0-r3:0[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(-)?] >=media-libs/jpeg-8d-r1:0[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(-)?] )
 SLOT=0
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=bb83b535bd9c94e9e3befa01ba174250
diff --git a/metadata/md5-cache/virtual/jpeg-62 b/metadata/md5-cache/virtual/jpeg-62
index 48c1328d82bf..bbf11899ebac 100644
--- a/metadata/md5-cache/virtual/jpeg-62
+++ b/metadata/md5-cache/virtual/jpeg-62
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( >=media-libs/libjpeg-turbo-1.3.0-r3: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(-)?] >=media-libs/jpeg-6b-r12:62[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=62
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=39bd284cdb9559c77980e7999f940989
diff --git a/metadata/md5-cache/virtual/krb5-0-r1 b/metadata/md5-cache/virtual/krb5-0-r1
index e58284c45438..f08048b68ade 100644
--- a/metadata/md5-cache/virtual/krb5-0-r1
+++ b/metadata/md5-cache/virtual/krb5-0-r1
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 RDEPEND=|| ( >=app-crypt/mit-krb5-1.12.1-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(-)?] >=app-crypt/heimdal-1.5.3-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(-)?] )
 SLOT=0
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=91be10b98c83c6abe8678d613635c908
diff --git a/metadata/md5-cache/virtual/libffi-3.0.13-r1 b/metadata/md5-cache/virtual/libffi-3.0.13-r1
index 92d7660154e8..4f584cd03101 100644
--- a/metadata/md5-cache/virtual/libffi-3.0.13-r1
+++ b/metadata/md5-cache/virtual/libffi-3.0.13-r1
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=>=dev-libs/libffi-3.0.13-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
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c290d978f24e215a76088bf1810487f3
diff --git a/metadata/md5-cache/virtual/libgudev-215-r1 b/metadata/md5-cache/virtual/libgudev-215-r1
index 961c36af589a..949063bc6f81 100644
--- a/metadata/md5-cache/virtual/libgudev-215-r1
+++ b/metadata/md5-cache/virtual/libgudev-215-r1
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 RDEPEND=!systemd? ( || ( >=sys-fs/udev-208-r1:0/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(-)?,gudev,introspection?,static-libs?] >=sys-fs/eudev-1.5.3-r1:0/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(-)?,gudev,introspection?,static-libs?] ) ) systemd? ( || ( >=sys-apps/systemd-212-r5:0/2[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(-)?,gudev,introspection?] >=sys-apps/systemd-208-r3:0/1[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(-)?,gudev,introspection?] >=sys-apps/systemd-208:0/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(-)?,gudev,introspection?] ) )
 REQUIRED_USE=systemd? ( !static-libs )
 SLOT=0/0
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=90840c7bfe8fa04b6df6b2c078f42c60
diff --git a/metadata/md5-cache/virtual/libgudev-215-r2 b/metadata/md5-cache/virtual/libgudev-215-r2
index fe22dbdf0349..38a7b5d78734 100644
--- a/metadata/md5-cache/virtual/libgudev-215-r2
+++ b/metadata/md5-cache/virtual/libgudev-215-r2
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 RDEPEND=|| ( dev-libs/libgudev:0/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(-)?,introspection?,static-libs?] !systemd? ( || ( >=sys-fs/udev-208-r1:0/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(-)?,gudev(-),introspection?,static-libs?] >=sys-fs/eudev-1.5.3-r1:0/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(-)?,gudev(-),introspection?,static-libs?] ) ) systemd? ( >=sys-apps/systemd-212-r5:0/2[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(-)?,gudev(-),introspection?] ) )
 REQUIRED_USE=systemd? ( !static-libs )
 SLOT=0/0
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=54b8004e4d0aab952c52d12307485dc2
diff --git a/metadata/md5-cache/virtual/libgudev-215-r3 b/metadata/md5-cache/virtual/libgudev-215-r3
index 51b1206ed135..49939ed39471 100644
--- a/metadata/md5-cache/virtual/libgudev-215-r3
+++ b/metadata/md5-cache/virtual/libgudev-215-r3
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 RDEPEND=|| ( dev-libs/libgudev:0/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(-)?,introspection?,static-libs?] !systemd? ( || ( >=sys-fs/udev-208-r1:0/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(-)?,gudev(-),introspection(-)?,static-libs?] >=sys-fs/eudev-1.5.3-r1:0/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(-)?,gudev(-),introspection(-)?,static-libs?] ) ) systemd? ( >=sys-apps/systemd-212-r5:0/2[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(-)?,gudev(-),introspection(-)?] ) )
 REQUIRED_USE=systemd? ( !static-libs )
 SLOT=0/0
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=87a96339ca0ba9b780f388cfb42c84ca
diff --git a/metadata/md5-cache/virtual/libgudev-230 b/metadata/md5-cache/virtual/libgudev-230
new file mode 100644
index 000000000000..ed399f821207
--- /dev/null
+++ b/metadata/md5-cache/virtual/libgudev-230
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for libgudev providers
+EAPI=5
+IUSE=introspection 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
+RDEPEND=dev-libs/libgudev:0/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(-)?,introspection?,static-libs?]
+SLOT=0/0
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=3b2534779978a13ce5ae3be26c593d76
diff --git a/metadata/md5-cache/virtual/libiconv-0-r1 b/metadata/md5-cache/virtual/libiconv-0-r1
index a09b977df0b4..1cf0d37bd16b 100644
--- a/metadata/md5-cache/virtual/libiconv-0-r1
+++ b/metadata/md5-cache/virtual/libiconv-0-r1
@@ -5,5 +5,5 @@ IUSE=elibc_glibc elibc_uclibc elibc_musl elibc_mintlib abi_x86_32 abi_x86_64 abi
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 RDEPEND=!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_mintlib? ( >=dev-libs/libiconv-1.14-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
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=a14ba42e4592d83ed2f9304892eb05c4
diff --git a/metadata/md5-cache/virtual/libiconv-0-r2 b/metadata/md5-cache/virtual/libiconv-0-r2
index 7d98664365e8..f33e7a003969 100644
--- a/metadata/md5-cache/virtual/libiconv-0-r2
+++ b/metadata/md5-cache/virtual/libiconv-0-r2
@@ -5,5 +5,5 @@ IUSE=elibc_glibc elibc_uclibc elibc_musl elibc_mintlib abi_x86_32 abi_x86_64 abi
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 RDEPEND=!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_mintlib? ( || ( >=dev-libs/libiconv-1.14-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(-)?] >=sys-freebsd/freebsd-lib-10.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(-)?] ) ) ) ) )
 SLOT=0
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=9582c9c35149ca5401902037b18e0e40
diff --git a/metadata/md5-cache/virtual/libintl-0-r1 b/metadata/md5-cache/virtual/libintl-0-r1
index 863871617eb8..5b7f2aa0babf 100644
--- a/metadata/md5-cache/virtual/libintl-0-r1
+++ b/metadata/md5-cache/virtual/libintl-0-r1
@@ -5,5 +5,5 @@ IUSE=elibc_glibc elibc_uclibc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( >=sys-devel/gettext-0.18.3.2[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
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=608dfa0e00f4dac1914c93ddc22d37ce
diff --git a/metadata/md5-cache/virtual/libudev-215-r1 b/metadata/md5-cache/virtual/libudev-215-r1
index d2f41262c329..24ca1f90764d 100644
--- a/metadata/md5-cache/virtual/libudev-215-r1
+++ b/metadata/md5-cache/virtual/libudev-215-r1
@@ -6,5 +6,5 @@ KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 RDEPEND=!systemd? ( || ( >=sys-fs/udev-208-r1:0/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(-)?,static-libs?] >=sys-fs/eudev-1.3:0/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(-)?,static-libs?] ) ) systemd? ( || ( >=sys-apps/systemd-212-r5:0/2[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(-)?] >=sys-apps/systemd-208-r3:0/1[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(-)?] >=sys-apps/systemd-208:0/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(-)?] ) )
 REQUIRED_USE=systemd? ( !static-libs )
 SLOT=0/1
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=b35f9a25536d1ea454ecfa2e91206324
diff --git a/metadata/md5-cache/virtual/libusb-0-r2 b/metadata/md5-cache/virtual/libusb-0-r2
index 83bb4c6cce69..718dfe0c1d96 100644
--- a/metadata/md5-cache/virtual/libusb-0-r2
+++ b/metadata/md5-cache/virtual/libusb-0-r2
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 RDEPEND=|| ( >=dev-libs/libusb-compat-0.1.5-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(-)?] >=sys-freebsd/freebsd-lib-9.1-r11[usb,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
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2f67f7a7cb4df4c86c88691d526ff9f9
diff --git a/metadata/md5-cache/virtual/libusb-1-r1 b/metadata/md5-cache/virtual/libusb-1-r1
index 4d7aec4121fb..71a56cf14b4a 100644
--- a/metadata/md5-cache/virtual/libusb-1-r1
+++ b/metadata/md5-cache/virtual/libusb-1-r1
@@ -5,5 +5,5 @@ IUSE=udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 RDEPEND=|| ( >=dev-libs/libusb-1.0.9-r2:1[udev(+)?,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(-)?] >=sys-freebsd/freebsd-lib-9.1-r10[usb,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=1
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=dac23473933020bdf6450dc30d786e74
diff --git a/metadata/md5-cache/virtual/mysql-5.6-r2 b/metadata/md5-cache/virtual/mysql-5.6-r2
index 95ab49088cf8..df3bfa8471c5 100644
--- a/metadata/md5-cache/virtual/mysql-5.6-r2
+++ b/metadata/md5-cache/virtual/mysql-5.6-r2
@@ -5,5 +5,5 @@ IUSE=embedded minimal static static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_m
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 RDEPEND=|| ( =dev-db/mariadb-10.0*[embedded=,minimal=,static=,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(-)?] =dev-db/mysql-5.6*[embedded=,minimal=,static=,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(-)?] =dev-db/percona-server-5.6*[embedded=,minimal=,static=,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(-)?] =dev-db/mariadb-galera-10.0*[embedded=,minimal=,static=,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(-)?] =dev-db/mysql-cluster-7.3*[embedded=,minimal=,static=,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(-)?] )
 SLOT=0/18
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=47035007eb308d28e849e739873f1355
diff --git a/metadata/md5-cache/virtual/opencl-0-r4 b/metadata/md5-cache/virtual/opencl-0-r4
index f6b5ef3de134..c280c004cfe1 100644
--- a/metadata/md5-cache/virtual/opencl-0-r4
+++ b/metadata/md5-cache/virtual/opencl-0-r4
@@ -5,5 +5,5 @@ IUSE=video_cards_fglrx video_cards_nvidia abi_x86_32 abi_x86_64 abi_x86_x32 abi_
 KEYWORDS=amd64 ~ppc x86
 RDEPEND=app-eselect/eselect-opencl || ( >=media-libs/mesa-9.1.6[opencl,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(-)?] video_cards_fglrx? ( >=x11-drivers/ati-drivers-12.1-r1 ) video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-290.10-r2 ) abi_x86_64? ( !abi_x86_32? ( dev-util/intel-ocl-sdk ) ) )
 SLOT=0
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=093f74784c75c908b4b514cb749b9853
diff --git a/metadata/md5-cache/virtual/opengl-7.0-r1 b/metadata/md5-cache/virtual/opengl-7.0-r1
index 2ba7a8410bb9..b949feb7161e 100644
--- a/metadata/md5-cache/virtual/opengl-7.0-r1
+++ b/metadata/md5-cache/virtual/opengl-7.0-r1
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=alpha amd64 arm ~arm64 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
 RDEPEND=|| ( >=media-libs/mesa-9.1.6[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(-)?] media-libs/opengl-apple )
 SLOT=0
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2aa3aaa5a92356152f7c8bed87e8b609
diff --git a/metadata/md5-cache/virtual/pam-0-r1 b/metadata/md5-cache/virtual/pam-0-r1
index 8c8063d9179e..ee1813046d0f 100644
--- a/metadata/md5-cache/virtual/pam-0-r1
+++ b/metadata/md5-cache/virtual/pam-0-r1
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux
 RDEPEND=|| ( >=sys-libs/pam-1.1.6-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(-)?] >=sys-auth/openpam-20120526-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
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6efeb415857a4f0be64eedeee881629d
diff --git a/metadata/md5-cache/virtual/pkgconfig-0-r1 b/metadata/md5-cache/virtual/pkgconfig-0-r1
index 2dc9a31ea5a4..95015946b046 100644
--- a/metadata/md5-cache/virtual/pkgconfig-0-r1
+++ b/metadata/md5-cache/virtual/pkgconfig-0-r1
@@ -5,5 +5,5 @@ IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 ab
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=|| ( >=dev-util/pkgconfig-0.28-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(-)?] >=dev-util/pkgconf-0.9.3-r1[pkg-config,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(-)?] >=dev-util/pkgconfig-openbsd-20130507-r1[pkg-config,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
-_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=2f71660b6d34246fa568cd44d9a8f54d
diff --git a/metadata/md5-cache/www-client/chromium-43.0.2357.65 b/metadata/md5-cache/www-client/chromium-43.0.2357.65
deleted file mode 100644
index 034b2fdf01b4..000000000000
--- a/metadata/md5-cache/www-client/chromium-43.0.2357.65
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/snappy:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.4.0:= >=media-libs/libvpx-1.4.0:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= sys-libs/zlib:=[minizip] virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig widevine? ( www-plugins/chrome-binary-plugins[widevine] ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/ply[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=5
-HOMEPAGE=http://chromium.org/
-IUSE=cups gnome gnome-keyring hidpi kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc widevine custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
-KEYWORDS=amd64 ~arm x86
-LICENSE=BSD
-RDEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/snappy:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.4.0:= >=media-libs/libvpx-1.4.0:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= sys-libs/zlib:=[minizip] virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-37 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-RESTRICT=proprietary-codecs? ( bindist )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-43.0.2357.65.tar.xz
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	chromium	ee8d79e69886593b65f7ee5e9d2710b4	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	portability	a45c088f246ef5091e029f6285d7ce42	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=928db980fdfcd0a03b25e27923ca545a
diff --git a/metadata/md5-cache/www-client/chromium-43.0.2357.73 b/metadata/md5-cache/www-client/chromium-43.0.2357.73
deleted file mode 100644
index 14b21d38f032..000000000000
--- a/metadata/md5-cache/www-client/chromium-43.0.2357.73
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/snappy:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.4.0:= >=media-libs/libvpx-1.4.0:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= sys-libs/zlib:=[minizip] virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) !arm? ( dev-lang/yasm ) dev-lang/perl dev-perl/JSON >=dev-util/gperf-3.0.3 dev-util/ninja sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig widevine? ( www-plugins/chrome-binary-plugins[widevine] ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/jinja[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/ply[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=5
-HOMEPAGE=http://chromium.org/
-IUSE=cups gnome gnome-keyring hidpi kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc widevine custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD
-RDEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= app-arch/snappy:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/elfutils-0.149 dev-libs/expat:= dev-libs/glib:= dev-libs/icu:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/fontconfig:= media-libs/freetype:= media-libs/harfbuzz:=[icu(+)] media-libs/libexif:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= >=media-libs/libwebp-0.4.0:= >=media-libs/libvpx-1.4.0:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/dbus:= sys-apps/pciutils:= >=sys-libs/libcap-2.22:= sys-libs/zlib:=[minizip] virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:= x11-libs/gtk+:2= x11-libs/libdrm x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-37 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-RESTRICT=proprietary-codecs? ( bindist )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-43.0.2357.73.tar.xz
-_eclasses_=check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	chromium	ee8d79e69886593b65f7ee5e9d2710b4	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	linux-info	8cbc678e083c23e4ad546ca6509cf304	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	pax-utils	dfe060cb70d89757fde5c1ff8405e950	portability	a45c088f246ef5091e029f6285d7ce42	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=6cc8a23f1223f3c8c782165b1a8c4594
diff --git a/metadata/md5-cache/www-client/epiphany-3.12.1 b/metadata/md5-cache/www-client/epiphany-3.12.1
deleted file mode 100644
index 593eb5a08adb..000000000000
--- a/metadata/md5-cache/www-client/epiphany-3.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=app-crypt/gcr-3.5.5 >=app-crypt/libsecret-0.14 >=app-text/iso-codes-0.35 >=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 >=gnome-base/gsettings-desktop-schemas-0.0.1 >=net-dns/avahi-0.6.22[dbus] >=net-libs/webkit-gtk-2.4:3[jit?] >=net-libs/libsoup-2.42.1:2.4 >=x11-libs/gtk+-3.11.6:3 >=x11-libs/libnotify-0.5.1:= gnome-base/gnome-desktop:3= dev-db/sqlite:3 x11-libs/libwnck:3 x11-libs/libX11 x11-themes/gnome-icon-theme x11-themes/gnome-icon-theme-symbolic nss? ( dev-libs/nss ) gnome-base/gnome-common >=dev-util/intltool-0.50 sys-apps/paxctl sys-devel/gettext virtual/pkgconfig app-text/yelp-tools !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=GNOME webbrowser based on Webkit
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Apps/Web
-IUSE=+jit +nss test debug test
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=app-crypt/gcr-3.5.5 >=app-crypt/libsecret-0.14 >=app-text/iso-codes-0.35 >=dev-libs/glib-2.38:2 >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 >=gnome-base/gsettings-desktop-schemas-0.0.1 >=net-dns/avahi-0.6.22[dbus] >=net-libs/webkit-gtk-2.4:3[jit?] >=net-libs/libsoup-2.42.1:2.4 >=x11-libs/gtk+-3.11.6:3 >=x11-libs/libnotify-0.5.1:= gnome-base/gnome-desktop:3= dev-db/sqlite:3 x11-libs/libwnck:3 x11-libs/libX11 x11-themes/gnome-icon-theme x11-themes/gnome-icon-theme-symbolic nss? ( dev-libs/nss ) !www-client/epiphany-extensions
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/epiphany/3.12/epiphany-3.12.1.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=4075659c93ea850e8b52c1b165817a1e
diff --git a/metadata/md5-cache/www-client/epiphany-3.16.2 b/metadata/md5-cache/www-client/epiphany-3.16.2
new file mode 100644
index 000000000000..32d79832e9fc
--- /dev/null
+++ b/metadata/md5-cache/www-client/epiphany-3.16.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=>=app-crypt/gcr-3.5.5 >=app-crypt/libsecret-0.14 >=app-text/iso-codes-0.35 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 >=gnome-base/gsettings-desktop-schemas-0.0.1 >=net-dns/avahi-0.6.22[dbus] >=net-libs/webkit-gtk-2.7.4:4[jit?] >=net-libs/libsoup-2.48:2.4 >=x11-libs/gtk+-3.13:3 >=x11-libs/libnotify-0.5.1:= gnome-base/gnome-desktop:3= dev-db/sqlite:3 x11-libs/libwnck:3 x11-libs/libX11 x11-themes/gnome-icon-theme x11-themes/gnome-icon-theme-symbolic nss? ( dev-libs/nss ) >=gnome-base/gnome-common-3.6 >=dev-util/intltool-0.50 sys-apps/paxctl sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=GNOME webbrowser based on Webkit
+EAPI=5
+HOMEPAGE=https://wiki.gnome.org/Apps/Web
+IUSE=+jit +nss test debug test
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-crypt/gcr-3.5.5 >=app-crypt/libsecret-0.14 >=app-text/iso-codes-0.35 >=dev-libs/glib-2.38:2[dbus] >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 >=gnome-base/gsettings-desktop-schemas-0.0.1 >=net-dns/avahi-0.6.22[dbus] >=net-libs/webkit-gtk-2.7.4:4[jit?] >=net-libs/libsoup-2.48:2.4 >=x11-libs/gtk+-3.13:3 >=x11-libs/libnotify-0.5.1:= gnome-base/gnome-desktop:3= dev-db/sqlite:3 x11-libs/libwnck:3 x11-libs/libX11 x11-themes/gnome-icon-theme x11-themes/gnome-icon-theme-symbolic nss? ( dev-libs/nss ) !www-client/epiphany-extensions
+SLOT=0
+SRC_URI=mirror://gnome/sources/epiphany/3.16/epiphany-3.16.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=63028665f31143a66c5b22c5ca9802b7
diff --git a/metadata/md5-cache/www-client/netsurf-3.2-r1 b/metadata/md5-cache/www-client/netsurf-3.2-r1
index 1a3cafe363f4..2f4214144d3c 100644
--- a/metadata/md5-cache/www-client/netsurf-3.2-r1
+++ b/metadata/md5-cache/www-client/netsurf-3.2-r1
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/libxml2 net-misc/curl >=dev-libs/libcss-0.4.0[abi_x86_32(-)?,ab
 REQUIRED_USE=|| ( fbcon gtk ) amd64? ( abi_x86_32? ( !gstreamer !javascript !pdf-writer svg? ( svgtiny ) !truetype ) ) fbcon? ( ^^ ( fbcon_frontend_able fbcon_frontend_linux fbcon_frontend_sdl fbcon_frontend_vnc fbcon_frontend_x ) )
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.2-src.tar.gz http://xmw.de/mirror/netsurf-fb.modes-example.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.2.tar.gz -> netsurf-buildsystem-1.2.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c0499c2c0220d55a654dffc365a29ddd
diff --git a/metadata/md5-cache/www-client/netsurf-3.3-r1 b/metadata/md5-cache/www-client/netsurf-3.3-r1
index 5fd327f3356b..9a84ccda3a8c 100644
--- a/metadata/md5-cache/www-client/netsurf-3.3-r1
+++ b/metadata/md5-cache/www-client/netsurf-3.3-r1
@@ -10,5 +10,5 @@ RDEPEND==dev-libs/libnsutils-0.0.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 REQUIRED_USE=|| ( fbcon gtk ) amd64? ( abi_x86_32? ( !javascript ) ) fbcon? ( ^^ ( fbcon_frontend_able fbcon_frontend_linux fbcon_frontend_sdl fbcon_frontend_vnc fbcon_frontend_x ) )
 SLOT=0
 SRC_URI=http://download.netsurf-browser.org/netsurf/releases/source/netsurf-3.3-src.tar.gz http://xmw.de/mirror/netsurf-fb.modes-example.gz http://download.netsurf-browser.org/libs/releases/buildsystem-1.3.tar.gz -> netsurf-buildsystem-1.3.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	netsurf	5ee087009e1637c1a121469ff25bef06	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=4361829b80bab6ddee550cdfb7635884
diff --git a/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.466 b/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.466
deleted file mode 100644
index 0d054cfd718c..000000000000
--- a/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.466
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prerm setup test unpack
-DEPEND=amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) ) app-arch/unzip
-DESCRIPTION=Adobe Flash Player
-EAPI=5
-HOMEPAGE=http://www.adobe.com/products/flashplayer.html http://get.adobe.com/flashplayer/
-IUSE=debug kde selinux cpu_flags_x86_sse2 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=-* amd64 x86
-LICENSE=AdobeFlash-11.x
-RDEPEND=amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) ) abi_x86_64? ( dev-libs/atk dev-libs/glib:2 dev-libs/nspr dev-libs/nss kde? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 kde-base/kdelibs x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXpm ) media-libs/fontconfig media-libs/freetype >=sys-libs/glibc-2.4 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXrender x11-libs/libXt x11-libs/pango ) abi_x86_32? ( amd64? ( >=dev-libs/atk-2.10.0[abi_x86_32(-)] >=dev-libs/glib-2.34.3:2[abi_x86_32(-)] >=dev-libs/nspr-4.10.4[abi_x86_32(-)] >=dev-libs/nss-3.15.4[abi_x86_32(-)] >=media-libs/fontconfig-2.10.92[abi_x86_32(-)] >=media-libs/freetype-2.5.0.1[abi_x86_32(-)] >=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)] >=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)] >=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)] >=x11-libs/libX11-1.6.2[abi_x86_32(-)] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)] >=x11-libs/libXext-1.3.2[abi_x86_32(-)] >=x11-libs/libXrender-0.9.8[abi_x86_32(-)] >=x11-libs/libXt-1.1.4[abi_x86_32(-)] >=x11-libs/pango-1.36.3[abi_x86_32(-)] ) x86? ( dev-libs/atk dev-libs/glib:2 dev-libs/nspr dev-libs/nss kde? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 kde-base/kdelibs x11-libs/libICE x11-libs/libSM x11-libs/libXau x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXpm ) media-libs/fontconfig media-libs/freetype >=sys-libs/glibc-2.4 x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXrender x11-libs/libXt x11-libs/pango ) ) || ( media-fonts/liberation-fonts media-fonts/corefonts ) selinux? ( sec-policy/selinux-flash )
-REQUIRED_USE=cpu_flags_x86_sse2 debug? ( abi_x86_32 ) || ( abi_x86_64 abi_x86_32 )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=abi_x86_32? ( !debug? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.466/install_flash_player_11_linux.i386.tar.gz -> adobe-flash-11.2.202.466.i386.tar.gz ) debug? ( http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz -> adobe-flash-11.2.202.466-debug.i386.tar.gz ) ) abi_x86_64? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.466/install_flash_player_11_linux.x86_64.tar.gz -> adobe-flash-11.2.202.466.x86_64.tar.gz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	mozextension	ba6829881080a663d68531424a3dfbc6	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=e092fe91ae83ee0b7e2963cacf9f80ac
diff --git a/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.468 b/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.468
index 77e49c7e3783..fb1c03b7b521 100644
--- a/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.468
+++ b/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.468
@@ -11,5 +11,5 @@ REQUIRED_USE=cpu_flags_x86_sse2 debug? ( abi_x86_32 ) || ( abi_x86_64 abi_x86_32
 RESTRICT=strip mirror
 SLOT=0
 SRC_URI=abi_x86_32? ( !debug? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.468/install_flash_player_11_linux.i386.tar.gz -> adobe-flash-11.2.202.468.i386.tar.gz ) debug? ( http://fpdownload.macromedia.com/pub/flashplayer/updaters/11/flashplayer_11_plugin_debug.i386.tar.gz -> adobe-flash-11.2.202.468-debug.i386.tar.gz ) ) abi_x86_64? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.468/install_flash_player_11_linux.x86_64.tar.gz -> adobe-flash-11.2.202.468.x86_64.tar.gz )
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	mozextension	ba6829881080a663d68531424a3dfbc6	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	mozextension	ba6829881080a663d68531424a3dfbc6	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	nsplugins	7ea51b2f6cbd5b36b9c0163cc3ee03a2	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=51c28d3171c3cef43e4cd79773fcba20
diff --git a/metadata/md5-cache/www-servers/monkeyd-1.5.6-r1 b/metadata/md5-cache/www-servers/monkeyd-1.5.6-r1
index 35854ee6aa32..37f855d280fb 100644
--- a/metadata/md5-cache/www-servers/monkeyd-1.5.6-r1
+++ b/metadata/md5-cache/www-servers/monkeyd-1.5.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A small, fast, and scalable web server
 EAPI=5
 HOMEPAGE=http://www.monkey-project.com/
 IUSE=-debug jemalloc php minimal elibc_musl elibc_uclibc monkeyd_plugins_auth monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril
-KEYWORDS=~amd64 arm ~mips ppc ppc64 ~x86
+KEYWORDS=amd64 arm ~mips ppc ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=php? ( dev-lang/php ) cgi? ( dev-lang/php[cgi] )
 REQUIRED_USE=elibc_uclibc? ( !debug ) cgi? ( php )
 SLOT=0
 SRC_URI=http://monkey-project.com/releases/1.5/monkey-1.5.6.tar.gz
 _eclasses_=depend.php	4400a239a11e94cd350b6b6f27d203e8	eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=8123cfa228daf8221069c20f67fe2390
+_md5_=3c0d0d03b778b367e97ea91d400c9021
diff --git a/metadata/md5-cache/www-servers/tornado-4.2 b/metadata/md5-cache/www-servers/tornado-4.2
new file mode 100644
index 000000000000..2d66db15ea90
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tornado-4.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=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(-)] 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(-)] dev-python/sphinx_rtd_theme[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/certifi[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/pycurl-7.18.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(-)] python_targets_python3_3? ( dev-python/asyncio[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python2_7? ( dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/twisted-names[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/twisted-web[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/mock[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(-)]
+DESCRIPTION=Tornado is a Python web framework and asynchronous networking library, ... .
+EAPI=5
+HOMEPAGE=http://www.tornadoweb.org/
+IUSE=doc examples test python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/certifi[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/pycurl-7.18.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(-)] python_targets_python3_3? ( dev-python/asyncio[python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python2_7? ( dev-python/backports-ssl-match-hostname[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/twisted-names[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/twisted-web[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=mirror://pypi/t/tornado/tornado-4.2.tar.gz -> tornado-4.2.tar.gz
+_eclasses_=distutils-r1	c01d5c4af34f4a37a51fc9638299c222	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	vcs-snapshot	58b766562c9fbfb3268b04e33cdf2f66
+_md5_=de808559f2836ab51b15020932a56b78
diff --git a/metadata/md5-cache/x11-drivers/ati-drivers-14.12-r2 b/metadata/md5-cache/x11-drivers/ati-drivers-14.12-r2
index 3eb3a55677b6..e53326cd9feb 100644
--- a/metadata/md5-cache/x11-drivers/ati-drivers-14.12-r2
+++ b/metadata/md5-cache/x11-drivers/ati-drivers-14.12-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=bindist test
 SLOT=1
 SRC_URI=mirror://gentoo/amd-catalyst-omega-14.12-linux-run-installers.zip http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	linux-mod	101302d4b7b694ea9622bbffb187d0de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	linux-mod	101302d4b7b694ea9622bbffb187d0de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=951a6f23edc3a12da799ea407432ec89
diff --git a/metadata/md5-cache/x11-drivers/ati-drivers-14.12-r3 b/metadata/md5-cache/x11-drivers/ati-drivers-14.12-r3
index b2b0786f8b55..7687439ebba6 100644
--- a/metadata/md5-cache/x11-drivers/ati-drivers-14.12-r3
+++ b/metadata/md5-cache/x11-drivers/ati-drivers-14.12-r3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=bindist test
 SLOT=1
 SRC_URI=mirror://gentoo/amd-catalyst-omega-14.12-linux-run-installers.zip http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	linux-mod	101302d4b7b694ea9622bbffb187d0de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	linux-mod	101302d4b7b694ea9622bbffb187d0de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=baa6b81ca561e0c0ada31c3ac829eafd
diff --git a/metadata/md5-cache/x11-drivers/ati-drivers-14.9-r2 b/metadata/md5-cache/x11-drivers/ati-drivers-14.9-r2
index d21979e796e3..4fcd68908d97 100644
--- a/metadata/md5-cache/x11-drivers/ati-drivers-14.9-r2
+++ b/metadata/md5-cache/x11-drivers/ati-drivers-14.9-r2
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=bindist test fetch
 SLOT=1
 SRC_URI=mirror://gentoo/amd-catalyst-14-9-linux-x86-x86-64.zip http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	linux-mod	101302d4b7b694ea9622bbffb187d0de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	linux-mod	101302d4b7b694ea9622bbffb187d0de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=d91d58e543585f6ab7373c4815650083
diff --git a/metadata/md5-cache/x11-drivers/ati-drivers-15.1 b/metadata/md5-cache/x11-drivers/ati-drivers-15.1
index 49c60a39f604..4d41c162485d 100644
--- a/metadata/md5-cache/x11-drivers/ati-drivers-15.1
+++ b/metadata/md5-cache/x11-drivers/ati-drivers-15.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
 RESTRICT=bindist test
 SLOT=1
 SRC_URI=mirror://ubuntu/pool/restricted/f/fglrx-installer/fglrx-installer_15.200.orig.tar.gz http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	linux-mod	101302d4b7b694ea9622bbffb187d0de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	linux-info	8cbc678e083c23e4ad546ca6509cf304	linux-mod	101302d4b7b694ea9622bbffb187d0de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=74571a4284f582375f65d9083b2cb450
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-352.21 b/metadata/md5-cache/x11-drivers/nvidia-drivers-352.21
index fe939bb7d3dd..081e45bb6d8f 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-352.21
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-352.21
@@ -4,7 +4,7 @@ DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=5
 HOMEPAGE=http://www.nvidia.com/
 IUSE=acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools gtk2 gtk3 +X uvm kernel_linux
-KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=-* amd64 x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=GPL-2 NVIDIA-r2
 RDEPEND=app-eselect/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-eselect/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( dev-libs/atk dev-libs/glib:2 x11-libs/gdk-pixbuf gtk2? ( >=x11-libs/gtk+-2.4:2 ) gtk3? ( x11-libs/gtk+:3 ) x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] ) X? ( <x11-base/xorg-server-1.17.99:= >=x11-libs/libvdpau-0.3-r1 multilib? ( >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] ) ) kernel_linux? ( virtual/modutils )
 REQUIRED_USE=tools? ( X || ( gtk2 gtk3 ) )
@@ -12,4 +12,4 @@ RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/352.21/NVIDIA-FreeBSD-x86_64-352.21.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/352.21/NVIDIA-Linux-x86_64-352.21.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/352.21/NVIDIA-FreeBSD-x86-352.21.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/352.21/NVIDIA-Linux-x86-352.21.run )
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	linux-info	8cbc678e083c23e4ad546ca6509cf304	linux-mod	101302d4b7b694ea9622bbffb187d0de	multilib	62927b3db3a589b0806255f3a002d5d3	nvidia-driver	800f567ff607d5d5171a8149456e294e	portability	a45c088f246ef5091e029f6285d7ce42	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	unpacker	f300a7ca9131b1024a79762e8edd3c52	user	f54e098dd38ba1c0847a13e685b87747	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=269a45a85318b094760b3bb065626566
+_md5_=1ab445cf6e9662833bf5f88539bedacf
diff --git a/metadata/md5-cache/x11-libs/cairo-1.12.18-r1 b/metadata/md5-cache/x11-libs/cairo-1.12.18-r1
index 786dfcc93ae8..398ad1452362 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.12.18-r1
+++ b/metadata/md5-cache/x11-libs/cairo-1.12.18-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=drm? ( X ) gallium? ( drm ) gles2? ( !opengl ) openvg? ( || ( gles2
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cairographics.org/releases/cairo-1.12.18.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e39973d98560f2478a58389156bd45fb
diff --git a/metadata/md5-cache/x11-libs/cairo-1.14.2 b/metadata/md5-cache/x11-libs/cairo-1.14.2
index 1d4adcd629c5..324c81bc493b 100644
--- a/metadata/md5-cache/x11-libs/cairo-1.14.2
+++ b/metadata/md5-cache/x11-libs/cairo-1.14.2
@@ -11,5 +11,5 @@ REQUIRED_USE=gles2? ( !opengl ) xlib-xcb? ( xcb )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://cairographics.org/releases/cairo-1.14.2.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=bbc780f0234bb0dbf5ffd4337e5a4ecb
diff --git a/metadata/md5-cache/x11-libs/cairo-9999 b/metadata/md5-cache/x11-libs/cairo-9999
index 80680358eb08..03334633d481 100644
--- a/metadata/md5-cache/x11-libs/cairo-9999
+++ b/metadata/md5-cache/x11-libs/cairo-9999
@@ -9,5 +9,5 @@ RDEPEND=>=dev-libs/lzo-2.06-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 REQUIRED_USE=gles2? ( !opengl ) xlib-xcb? ( xcb )
 RESTRICT=test
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	git-r3	ab80045e5d080584334f33013f4df21d	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=1df4d37d4dfedb36a5c596f841c207b5
diff --git a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.30.8 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.30.8
index e0d623a23d6d..a5f7b8bf3691 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.30.8
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.30.8
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.37.6:2[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(-)?] >=media-libs/libpng-1.4: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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) jpeg? ( virtual/jpeg: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(-)?] ) jpeg2k? ( media-libs/jasper:=[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(-)?] ) tiff? ( >=media-libs/tiff-3.9.2: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(-)?] ) X? ( x11-libs/libX11[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(-)?] ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3 abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008-r2 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.30/gdk-pixbuf-2.30.8.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6c93473c1b835bfdd5a991ee16dfb196
diff --git a/metadata/md5-cache/x11-libs/gtk+-1.2.10-r13 b/metadata/md5-cache/x11-libs/gtk+-1.2.10-r13
index f612a9d7bad2..3855a60ca341 100644
--- a/metadata/md5-cache/x11-libs/gtk+-1.2.10-r13
+++ b/metadata/md5-cache/x11-libs/gtk+-1.2.10-r13
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-1.2.10-r6:1[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(-)?] >=x11-libs/libX11-1.5.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(-)?] >=x11-libs/libXext-1.3.1-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(-)?] >=x11-libs/libXi-1.7.2[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(-)?] >=x11-libs/libXt-1.1.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(-)?]
 SLOT=1
 SRC_URI=mirror://gnome/sources/gtk+/1.2/gtk+-1.2.10.tar.gz http://www.ibiblio.org/gentoo/distfiles/gtk+-1.2.10-r8-gentoo.diff.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=88fa7dcf36e6f2cfaa857a74223cc90c
diff --git a/metadata/md5-cache/x11-libs/gtk+-2.24.25 b/metadata/md5-cache/x11-libs/gtk+-2.24.25
index 2e9120211566..f0b94308894d 100644
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.25
+++ b/metadata/md5-cache/x11-libs/gtk+-2.24.25
@@ -10,5 +10,5 @@ PDEPEND=vim-syntax? ( app-vim/gtk-syntax )
 RDEPEND=!aqua? ( >=x11-libs/libXrender-0.9.8[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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXi-1.7.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXrandr-1.4.2[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(-)?] >=x11-libs/libXcursor-1.1.14[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(-)?] >=x11-libs/libXfixes-5.0.1[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(-)?] >=x11-libs/libXcomposite-0.4.4-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(-)?] >=x11-libs/libXdamage-1.1.4-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(-)?] >=x11-libs/cairo-1.12.14-r4:=[X,svg,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(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[X,introspection?,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(-)?] ) aqua? ( >=x11-libs/cairo-1.6:=[aqua,svg] x11-libs/gdk-pixbuf:2[introspection?] ) xinerama? ( >=x11-libs/libXinerama-1.1.3[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(-)?] ) >=dev-libs/glib-2.34.3:2[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(-)?] >=x11-libs/pango-1.36.3[introspection?,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(-)?] >=dev-libs/atk-2.10.0[introspection?,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(-)?] >=media-libs/fontconfig-2.10.92[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(-)?] x11-misc/shared-mime-info cups? ( >=net-print/cups-1.7.1-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(-)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !<gnome-base/gail-1000 !<dev-util/gtk-builder-convert-2.24.25 !<x11-libs/vte-0.28.2-r201:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20140508 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.25.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=5e27d1fbe3c9ccc6cd205b7245fdf9e5
diff --git a/metadata/md5-cache/x11-libs/gtk+-2.24.27 b/metadata/md5-cache/x11-libs/gtk+-2.24.27
index 868ba620908a..733435920a6c 100644
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.27
+++ b/metadata/md5-cache/x11-libs/gtk+-2.24.27
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/atk-2.10.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 REQUIRED_USE=xinerama? ( !aqua )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.27.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=da74ed66c41d898c072d6ec21043556c
diff --git a/metadata/md5-cache/x11-libs/gtk+-2.24.28-r1 b/metadata/md5-cache/x11-libs/gtk+-2.24.28-r1
index f4ddfb220fc4..04125709a6f4 100644
--- a/metadata/md5-cache/x11-libs/gtk+-2.24.28-r1
+++ b/metadata/md5-cache/x11-libs/gtk+-2.24.28-r1
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/atk-2.10.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 REQUIRED_USE=xinerama? ( !aqua )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtk+/2.24/gtk+-2.24.28.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	readme.gentoo	106edea5533517715013de909a333abd	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=71f248bcd0b6bb48bce2afad643e207f
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.14.13 b/metadata/md5-cache/x11-libs/gtk+-3.14.13
index 8bc83b10a8d0..5e2f64c5eb86 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.14.13
+++ b/metadata/md5-cache/x11-libs/gtk+-3.14.13
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/atk-2.12[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.14/gtk+-3.14.13.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=0c630332f4de19b73bc003ccbad08b44
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.14.9 b/metadata/md5-cache/x11-libs/gtk+-3.14.9
index 006ea5d769bb..321ce4a8098d 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.14.9
+++ b/metadata/md5-cache/x11-libs/gtk+-3.14.9
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/atk-2.12[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.14/gtk+-3.14.9.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=dd02cd6c56d545b6d8293db4dd46635e
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.16.3 b/metadata/md5-cache/x11-libs/gtk+-3.16.3
index f1f888b15bc4..3135b0ee1390 100644
--- a/metadata/md5-cache/x11-libs/gtk+-3.16.3
+++ b/metadata/md5-cache/x11-libs/gtk+-3.16.3
@@ -11,5 +11,5 @@ RDEPEND=>=dev-libs/atk-2.15[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=|| ( aqua wayland X ) xinerama? ( X )
 SLOT=3
 SRC_URI=mirror://gnome/sources/gtk+/3.16/gtk+-3.16.3.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	c9602887773166fe300444712fc7ff98	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=49a08ece155f69e49f047b133b7e1777
diff --git a/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r2 b/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r2
index e8ccbf00167c..e0cb0978cfa6 100644
--- a/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r2
+++ b/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] >=x11-libs/gtk+-2.24.23:2[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(-)?] >=x11-libs/pango-1.36.3[X,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(-)?] || ( >=x11-libs/pangox-compat-0.0.2[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(-)?] <x11-libs/pango-1.31[X,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(-)?] ) >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXmu-1.1.1-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(-)?] >=virtual/glu-9.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(-)?] >=virtual/opengl-7.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
 SRC_URI=mirror://sourceforge/gtkglext/gtkglext-1.2.0.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=8ee0693e67f924f71dd5092d58298dc8
diff --git a/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r3 b/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r3
index 6a6e9da7b513..421a04acffb3 100644
--- a/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r3
+++ b/metadata/md5-cache/x11-libs/gtkglext-1.2.0-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] >=x11-libs/gtk+-2.24.23:2[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(-)?] >=x11-libs/pango-1.36.3[X,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(-)?] || ( >=x11-libs/pangox-compat-0.0.2[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(-)?] <x11-libs/pango-1.31[X,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(-)?] ) >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXmu-1.1.1-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(-)?] >=virtual/glu-9.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(-)?] >=virtual/opengl-7.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
 SRC_URI=mirror://sourceforge/gtkglext/gtkglext-1.2.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=dd3c0a04972f686b1b7bee254c2948ad
diff --git a/metadata/md5-cache/x11-libs/libICE-1.0.8-r1 b/metadata/md5-cache/x11-libs/libICE-1.0.8-r1
index 71d30d4ccb6b..c910dbe3df1a 100644
--- a/metadata/md5-cache/x11-libs/libICE-1.0.8-r1
+++ b/metadata/md5-cache/x11-libs/libICE-1.0.8-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/xtrans >=x11-proto/xproto-7.0.24[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.8.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=d2794b7906dedc643886e88839b745ec
diff --git a/metadata/md5-cache/x11-libs/libICE-1.0.9 b/metadata/md5-cache/x11-libs/libICE-1.0.9
index 9044f39cd35e..cf956939340b 100644
--- a/metadata/md5-cache/x11-libs/libICE-1.0.9
+++ b/metadata/md5-cache/x11-libs/libICE-1.0.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/xtrans >=x11-proto/xproto-7.0.24[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libICE-1.0.9.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=ea08c618b4cf0bce4b00a34abadfeea0
diff --git a/metadata/md5-cache/x11-libs/libSM-1.2.2-r1 b/metadata/md5-cache/x11-libs/libSM-1.2.2-r1
index 6fef96b76ee2..d9216b477ccf 100644
--- a/metadata/md5-cache/x11-libs/libSM-1.2.2-r1
+++ b/metadata/md5-cache/x11-libs/libSM-1.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libICE-1.0.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(-)?] x11-libs/xtrans >=x11-proto/xproto-7.0.24[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(-)?] !elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? ( uuid? ( >=sys-apps/util-linux-2.24.1-r3[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libSM-1.2.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=a584c6ea6183bad5ac96c2a732b64cb2
diff --git a/metadata/md5-cache/x11-libs/libX11-1.6.2 b/metadata/md5-cache/x11-libs/libX11-1.6.2
index ecae18789aff..57ddcf3abe68 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.6.2
+++ b/metadata/md5-cache/x11-libs/libX11-1.6.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.9.3[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(-)?] x11-libs/xtrans >=x11-proto/xproto-7.0.24[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(-)?] >=x11-proto/xf86bigfontproto-1.2.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(-)?] >=x11-proto/inputproto-2.3[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(-)?] >=x11-proto/kbproto-1.0.6-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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libX11-1.6.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=cf4f202d95fb11a66d24dcd4b7722cfa
diff --git a/metadata/md5-cache/x11-libs/libX11-1.6.3 b/metadata/md5-cache/x11-libs/libX11-1.6.3
index eb94fbb7d7c2..9d4f3083745c 100644
--- a/metadata/md5-cache/x11-libs/libX11-1.6.3
+++ b/metadata/md5-cache/x11-libs/libX11-1.6.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.9.3[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(-)?] x11-libs/xtrans >=x11-proto/xproto-7.0.24[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(-)?] >=x11-proto/xf86bigfontproto-1.2.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(-)?] >=x11-proto/inputproto-2.3[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(-)?] >=x11-proto/kbproto-1.0.6-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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libX11-1.6.3.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=9981149a6366d7e704bbe67c79c2d910
diff --git a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2-r1 b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2-r1
index e36c066227ca..c041580ce3f2 100644
--- a/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2-r1
+++ b/metadata/md5-cache/x11-libs/libXScrnSaver-1.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-proto/scrnsaverproto-1.2.2-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXScrnSaver-1.2.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=32940f9d112e7e4a58288b570db2a7fb
diff --git a/metadata/md5-cache/x11-libs/libXau-1.0.8 b/metadata/md5-cache/x11-libs/libXau-1.0.8
index 67cf196e8d8a..6396d931963b 100644
--- a/metadata/md5-cache/x11-libs/libXau-1.0.8
+++ b/metadata/md5-cache/x11-libs/libXau-1.0.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-proto/xproto-7.0.24[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.8.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=b1226bfd984e85ad9803d8eee8ee1495
diff --git a/metadata/md5-cache/x11-libs/libXaw-1.0.11-r2 b/metadata/md5-cache/x11-libs/libXaw-1.0.11-r2
index 9a744cbcace7..c8b5bbebf5dd 100644
--- a/metadata/md5-cache/x11-libs/libXaw-1.0.11-r2
+++ b/metadata/md5-cache/x11-libs/libXaw-1.0.11-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXt-1.1.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(-)?] >=x11-libs/libXmu-1.1.1-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(-)?] >=x11-libs/libXpm-3.5.10-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(-)?] >=x11-proto/xproto-7.0.24[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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.11.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=40ebcd79fb26b3022e4755ad70d5426e
diff --git a/metadata/md5-cache/x11-libs/libXaw-1.0.12 b/metadata/md5-cache/x11-libs/libXaw-1.0.12
index e9659f87e93e..ebb3972e9111 100644
--- a/metadata/md5-cache/x11-libs/libXaw-1.0.12
+++ b/metadata/md5-cache/x11-libs/libXaw-1.0.12
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXt-1.1.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(-)?] >=x11-libs/libXmu-1.1.1-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(-)?] >=x11-libs/libXpm-3.5.10-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(-)?] >=x11-proto/xproto-7.0.24[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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.12.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=9b8fe824227ae205b6a849088300a131
diff --git a/metadata/md5-cache/x11-libs/libXcomposite-0.4.4-r1 b/metadata/md5-cache/x11-libs/libXcomposite-0.4.4-r1
index 441f0fae8fa3..b523ae5d0c5d 100644
--- a/metadata/md5-cache/x11-libs/libXcomposite-0.4.4-r1
+++ b/metadata/md5-cache/x11-libs/libXcomposite-0.4.4-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXfixes-5.0.1[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(-)?] >=x11-proto/compositeproto-0.4.2-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(-)?] >=x11-proto/xproto-7.0.24[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXcomposite-0.4.4.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=1ecd327b0b565292f71964cf60d52c8b
diff --git a/metadata/md5-cache/x11-libs/libXcursor-1.1.14 b/metadata/md5-cache/x11-libs/libXcursor-1.1.14
index c6592f122fad..f4668139de88 100644
--- a/metadata/md5-cache/x11-libs/libXcursor-1.1.14
+++ b/metadata/md5-cache/x11-libs/libXcursor-1.1.14
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.9.8[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(-)?] >=x11-libs/libXfixes-5.0.1[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(-)?] >=x11-libs/libX11-1.6.2[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.1.14.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=dcd0ae60bc87f7d90141e8ed11fb58f1
diff --git a/metadata/md5-cache/x11-libs/libXdamage-1.1.4-r1 b/metadata/md5-cache/x11-libs/libXdamage-1.1.4-r1
index 741f59e6d1df..cf1553dafb89 100644
--- a/metadata/md5-cache/x11-libs/libXdamage-1.1.4-r1
+++ b/metadata/md5-cache/x11-libs/libXdamage-1.1.4-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXfixes-5.0.1[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(-)?] >=x11-proto/damageproto-1.2.1-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(-)?] >=x11-proto/xproto-7.0.24[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXdamage-1.1.4.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=c988753b16449eca434739c1261ce81a
diff --git a/metadata/md5-cache/x11-libs/libXdmcp-1.1.1-r1 b/metadata/md5-cache/x11-libs/libXdmcp-1.1.1-r1
index aad136718ff2..25704d44660e 100644
--- a/metadata/md5-cache/x11-libs/libXdmcp-1.1.1-r1
+++ b/metadata/md5-cache/x11-libs/libXdmcp-1.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-proto/xproto abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-1.1.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=29e81bdd337e66d8ce1682432f8b133d
diff --git a/metadata/md5-cache/x11-libs/libXdmcp-1.1.2 b/metadata/md5-cache/x11-libs/libXdmcp-1.1.2
index 447663968202..70435fd1ab00 100644
--- a/metadata/md5-cache/x11-libs/libXdmcp-1.1.2
+++ b/metadata/md5-cache/x11-libs/libXdmcp-1.1.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-proto/xproto abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXdmcp-1.1.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=84016c7a44062f5696d1e646bd28287e
diff --git a/metadata/md5-cache/x11-libs/libXext-1.3.2 b/metadata/md5-cache/x11-libs/libXext-1.3.2
index 648c7db93752..cc748b997051 100644
--- a/metadata/md5-cache/x11-libs/libXext-1.3.2
+++ b/metadata/md5-cache/x11-libs/libXext-1.3.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXext-1.3.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=60fcc2bcd639d49e6b4336a1dee7b588
diff --git a/metadata/md5-cache/x11-libs/libXext-1.3.3 b/metadata/md5-cache/x11-libs/libXext-1.3.3
index 8834254b7d61..9276e91aeda9 100644
--- a/metadata/md5-cache/x11-libs/libXext-1.3.3
+++ b/metadata/md5-cache/x11-libs/libXext-1.3.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2:=[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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXext-1.3.3.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=275ea5f87fe003aaa9db6e8e3aa27284
diff --git a/metadata/md5-cache/x11-libs/libXfixes-5.0.1 b/metadata/md5-cache/x11-libs/libXfixes-5.0.1
index e402697e7e0a..dd8ffcb1c2eb 100644
--- a/metadata/md5-cache/x11-libs/libXfixes-5.0.1
+++ b/metadata/md5-cache/x11-libs/libXfixes-5.0.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-proto/fixesproto-5.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(-)?] >=x11-proto/xproto-7.0.24[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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXfixes-5.0.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=bffcb7ccc3a230ca63ad31d0971654ff
diff --git a/metadata/md5-cache/x11-libs/libXft-2.3.1-r1 b/metadata/md5-cache/x11-libs/libXft-2.3.1-r1
index 9169087b61e2..394d0695f57d 100644
--- a/metadata/md5-cache/x11-libs/libXft-2.3.1-r1
+++ b/metadata/md5-cache/x11-libs/libXft-2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.9.8[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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=media-libs/freetype-2.5.0.1[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(-)?] >=media-libs/fontconfig-2.10.92[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(-)?] >=x11-proto/xproto-7.0.24[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(-)?] virtual/ttf-fonts abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXft-2.3.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=9d8fb320fb53ba75f8d8c92556e0d69c
diff --git a/metadata/md5-cache/x11-libs/libXft-2.3.2 b/metadata/md5-cache/x11-libs/libXft-2.3.2
index 4dc6823abced..29e828ffe53d 100644
--- a/metadata/md5-cache/x11-libs/libXft-2.3.2
+++ b/metadata/md5-cache/x11-libs/libXft-2.3.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXrender-0.9.8[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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=media-libs/freetype-2.5.0.1[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(-)?] >=media-libs/fontconfig-2.10.92[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(-)?] >=x11-proto/xproto-7.0.24[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(-)?] virtual/ttf-fonts abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXft-2.3.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=6db552cc75078609ac59ca33f8e1ac27
diff --git a/metadata/md5-cache/x11-libs/libXi-1.7.2 b/metadata/md5-cache/x11-libs/libXi-1.7.2
index c5e7608fa059..fdaebf6201c3 100644
--- a/metadata/md5-cache/x11-libs/libXi-1.7.2
+++ b/metadata/md5-cache/x11-libs/libXi-1.7.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXfixes-5.0.1[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(-)?] >=x11-proto/inputproto-2.3[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(-)?] >=x11-proto/xproto-7.0.24[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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.7.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=66824aec4f3128dbc8d226f11e91d2d7
diff --git a/metadata/md5-cache/x11-libs/libXi-1.7.4 b/metadata/md5-cache/x11-libs/libXi-1.7.4
index c83953ca5260..f768fd2b3129 100644
--- a/metadata/md5-cache/x11-libs/libXi-1.7.4
+++ b/metadata/md5-cache/x11-libs/libXi-1.7.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXfixes-5.0.1[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(-)?] >=x11-proto/inputproto-2.3[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(-)?] >=x11-proto/xproto-7.0.24[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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXi-1.7.4.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=dae2317788b7f779365ae654a00d30ca
diff --git a/metadata/md5-cache/x11-libs/libXinerama-1.1.3 b/metadata/md5-cache/x11-libs/libXinerama-1.1.3
index 6ba166e96ad0..1d7d8bb8b421 100644
--- a/metadata/md5-cache/x11-libs/libXinerama-1.1.3
+++ b/metadata/md5-cache/x11-libs/libXinerama-1.1.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] >=x11-proto/xineramaproto-1.2.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXinerama-1.1.3.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=7a4dda4b978b05615067a87386502b30
diff --git a/metadata/md5-cache/x11-libs/libXmu-1.1.1-r1 b/metadata/md5-cache/x11-libs/libXmu-1.1.1-r1
index ec240da72aac..fea3eb5e5b6f 100644
--- a/metadata/md5-cache/x11-libs/libXmu-1.1.1-r1
+++ b/metadata/md5-cache/x11-libs/libXmu-1.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXt-1.1.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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXmu-1.1.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=e900d7e7a92378d0ae4eb961878a3594
diff --git a/metadata/md5-cache/x11-libs/libXmu-1.1.2 b/metadata/md5-cache/x11-libs/libXmu-1.1.2
index 4b0c2ded2737..7b6f286a6004 100644
--- a/metadata/md5-cache/x11-libs/libXmu-1.1.2
+++ b/metadata/md5-cache/x11-libs/libXmu-1.1.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libXt-1.1.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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXmu-1.1.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=c3f949cb49b1a725983345cc0b3b8b13
diff --git a/metadata/md5-cache/x11-libs/libXp-1.0.2 b/metadata/md5-cache/x11-libs/libXp-1.0.2
index 91fb8e23ad73..176528090e6f 100644
--- a/metadata/md5-cache/x11-libs/libXp-1.0.2
+++ b/metadata/md5-cache/x11-libs/libXp-1.0.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXau-1.0.7-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(-)?] >=x11-proto/printproto-1.0.5-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXp-1.0.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=c4e77ae56046fe60a512826014849972
diff --git a/metadata/md5-cache/x11-libs/libXp-1.0.3 b/metadata/md5-cache/x11-libs/libXp-1.0.3
index c93d7052ae59..22b3553216ba 100644
--- a/metadata/md5-cache/x11-libs/libXp-1.0.3
+++ b/metadata/md5-cache/x11-libs/libXp-1.0.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXau-1.0.7-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(-)?] >=x11-proto/printproto-1.0.5-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXp-1.0.3.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=bae9f453738dca9f2055466d4a457528
diff --git a/metadata/md5-cache/x11-libs/libXpm-3.5.10-r1 b/metadata/md5-cache/x11-libs/libXpm-3.5.10-r1
index b6f938ab0f4b..71715db1152c 100644
--- a/metadata/md5-cache/x11-libs/libXpm-3.5.10-r1
+++ b/metadata/md5-cache/x11-libs/libXpm-3.5.10-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXt-1.1.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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] >=x11-proto/xproto-7.0.24[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXpm-3.5.10.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=be6fb53fcd21c98e17f541571d19a1b6
diff --git a/metadata/md5-cache/x11-libs/libXpm-3.5.11 b/metadata/md5-cache/x11-libs/libXpm-3.5.11
index 447f14101f5d..a48ddce60b5f 100644
--- a/metadata/md5-cache/x11-libs/libXpm-3.5.11
+++ b/metadata/md5-cache/x11-libs/libXpm-3.5.11
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXt-1.1.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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] >=x11-proto/xproto-7.0.24[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXpm-3.5.11.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=35b514e76f741707f068138a2f948110
diff --git a/metadata/md5-cache/x11-libs/libXrandr-1.4.2 b/metadata/md5-cache/x11-libs/libXrandr-1.4.2
index 55018d7ddda7..15cf0e2e2521 100644
--- a/metadata/md5-cache/x11-libs/libXrandr-1.4.2
+++ b/metadata/md5-cache/x11-libs/libXrandr-1.4.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXrender-0.9.8[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(-)?] >=x11-proto/randrproto-1.4.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(-)?] >=x11-proto/renderproto-0.11.1-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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.4.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=f111c56914cdd0bd3f93af7b6644c8fb
diff --git a/metadata/md5-cache/x11-libs/libXrender-0.9.8 b/metadata/md5-cache/x11-libs/libXrender-0.9.8
index 005c70a30717..1b60347ec702 100644
--- a/metadata/md5-cache/x11-libs/libXrender-0.9.8
+++ b/metadata/md5-cache/x11-libs/libXrender-0.9.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-proto/renderproto-0.11.1-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(-)?] >=x11-proto/xproto-7.0.24[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXrender-0.9.8.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=759788d19a0bf1cffb7022aa1e6558fd
diff --git a/metadata/md5-cache/x11-libs/libXt-1.1.4 b/metadata/md5-cache/x11-libs/libXt-1.1.4
index 03f743c0cd2c..08ef898e7ecd 100644
--- a/metadata/md5-cache/x11-libs/libXt-1.1.4
+++ b/metadata/md5-cache/x11-libs/libXt-1.1.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libSM-1.2.1-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(-)?] >=x11-libs/libICE-1.0.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(-)?] >=x11-proto/xproto-7.0.24[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(-)?] >=x11-proto/kbproto-1.0.6-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXt-1.1.4.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=72dc10d3ac696fd7e5f86f6e776e6806
diff --git a/metadata/md5-cache/x11-libs/libXtst-1.2.2 b/metadata/md5-cache/x11-libs/libXtst-1.2.2
index fec47ecafa1c..9e370b0fdb65 100644
--- a/metadata/md5-cache/x11-libs/libXtst-1.2.2
+++ b/metadata/md5-cache/x11-libs/libXtst-1.2.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXi-1.7.2[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(-)?] >=x11-proto/recordproto-1.14.2-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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] >=x11-proto/inputproto-2.3[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXtst-1.2.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=53c8f902076a1131ef3704aaff6ac651
diff --git a/metadata/md5-cache/x11-libs/libXv-1.0.10 b/metadata/md5-cache/x11-libs/libXv-1.0.10
index 511fc6603cc8..1a02563d5585 100644
--- a/metadata/md5-cache/x11-libs/libXv-1.0.10
+++ b/metadata/md5-cache/x11-libs/libXv-1.0.10
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-proto/videoproto-2.3.1-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(-)?] >=x11-proto/xproto-7.0.24[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXv-1.0.10.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=5112072f59cf2299921b669429a1680b
diff --git a/metadata/md5-cache/x11-libs/libXvMC-1.0.8 b/metadata/md5-cache/x11-libs/libXvMC-1.0.8
index 15f0a35390c5..d41165a7068c 100644
--- a/metadata/md5-cache/x11-libs/libXvMC-1.0.8
+++ b/metadata/md5-cache/x11-libs/libXvMC-1.0.8
@@ -10,5 +10,5 @@ PDEPEND=app-eselect/eselect-xvmc
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXv-1.0.10[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(-)?] >=x11-proto/videoproto-2.3.1-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(-)?] >=x11-proto/xproto-7.0.24[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXvMC-1.0.8.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=572653a30bd8f8b2b782d26ade0d30df
diff --git a/metadata/md5-cache/x11-libs/libXvMC-1.0.9 b/metadata/md5-cache/x11-libs/libXvMC-1.0.9
index faa20e410ad1..d6ddcbbeecbc 100644
--- a/metadata/md5-cache/x11-libs/libXvMC-1.0.9
+++ b/metadata/md5-cache/x11-libs/libXvMC-1.0.9
@@ -10,5 +10,5 @@ PDEPEND=app-eselect/eselect-xvmc
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXv-1.0.10[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(-)?] >=x11-proto/videoproto-2.3.1-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(-)?] >=x11-proto/xproto-7.0.24[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXvMC-1.0.9.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=8888ced46b9514001509778cd4dff7c4
diff --git a/metadata/md5-cache/x11-libs/libXxf86dga-1.1.4 b/metadata/md5-cache/x11-libs/libXxf86dga-1.1.4
index 09e231be2ec0..74bc370b2fb7 100644
--- a/metadata/md5-cache/x11-libs/libXxf86dga-1.1.4
+++ b/metadata/md5-cache/x11-libs/libXxf86dga-1.1.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] >=x11-proto/xproto-7.0.24[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(-)?] >=x11-proto/xf86dgaproto-2.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXxf86dga-1.1.4.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=aebaa2b8e444f7912c6eb2885ac5d90e
diff --git a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.3 b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.3
index 598c141e428e..28aaa238c98f 100644
--- a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.3
+++ b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-proto/xf86vidmodeproto-2.3.1-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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] >=x11-proto/xproto-7.0.24[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.1.3.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=fb92099e54efbe44f461ef045ec90034
diff --git a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4 b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4
index ab1eb8eb2c83..8adebc3af67b 100644
--- a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4
+++ b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-proto/xf86vidmodeproto-2.3.1-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(-)?] >=x11-proto/xextproto-7.2.1-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(-)?] >=x11-proto/xproto-7.0.24[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.1.4.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=c2f533013b36491feb4f1866838aeef7
diff --git a/metadata/md5-cache/x11-libs/libcryptui-3.12.2 b/metadata/md5-cache/x11-libs/libcryptui-3.12.2
index 6353e9170b08..017fd2eeab24 100644
--- a/metadata/md5-cache/x11-libs/libcryptui-3.12.2
+++ b/metadata/md5-cache/x11-libs/libcryptui-3.12.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3:3[introspection?] >=dev-libs/dbus-glib-0.72 gnome-base/libgnome-keyring x11-libs/libICE x11-libs/libSM >=app-crypt/gpgme-1 || ( =app-crypt/gnupg-2.0* =app-crypt/gnupg-1.4* ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) libnotify? ( >=x11-libs/libnotify-0.7:= ) >=app-text/scrollkeeper-0.3 >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4
+DEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3:3[introspection?] >=dev-libs/dbus-glib-0.72 gnome-base/libgnome-keyring x11-libs/libICE x11-libs/libSM >=app-crypt/gpgme-1 >=app-crypt/gnupg-1.4 introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) >=app-text/scrollkeeper-0.3 >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4
 DESCRIPTION=User interface components for OpenPGP
 EAPI=5
 HOMEPAGE=https://wiki.gnome.org/Apps/Seahorse
 IUSE=+introspection libnotify debug
 KEYWORDS=amd64 ~ppc ~ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1
-RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3:3[introspection?] >=dev-libs/dbus-glib-0.72 gnome-base/libgnome-keyring x11-libs/libICE x11-libs/libSM >=app-crypt/gpgme-1 || ( =app-crypt/gnupg-2.0* =app-crypt/gnupg-1.4* ) introspection? ( >=dev-libs/gobject-introspection-0.6.4 ) libnotify? ( >=x11-libs/libnotify-0.7:= ) !<app-crypt/seahorse-3.1.4
+RDEPEND=>=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3:3[introspection?] >=dev-libs/dbus-glib-0.72 gnome-base/libgnome-keyring x11-libs/libICE x11-libs/libSM >=app-crypt/gpgme-1 >=app-crypt/gnupg-1.4 introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) libnotify? ( >=x11-libs/libnotify-0.7:= ) !<app-crypt/seahorse-3.1.4
 SLOT=0
 SRC_URI=mirror://gnome/sources/libcryptui/3.12/libcryptui-3.12.2.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=6e1c6415063f4bf3b70127c7648c1657
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=110099e10680c57969f56cccfc768d1c
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.52 b/metadata/md5-cache/x11-libs/libdrm-2.4.52
index 02d2cc386caf..a9c2cdac5a8a 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.52
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.52
@@ -11,5 +11,5 @@ REQUIRED_USE=video_cards_exynos? ( libkms )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.52.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=8055aae491c9f30d6910d900868f2d74
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.53 b/metadata/md5-cache/x11-libs/libdrm-2.4.53
index 65fec2e6a568..57ab43d39f9d 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.53
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.53
@@ -11,5 +11,5 @@ REQUIRED_USE=video_cards_exynos? ( libkms )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.53.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=3f8a2435d3cf38ff2b7020290e2aa038
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.54 b/metadata/md5-cache/x11-libs/libdrm-2.4.54
index d82abb14745a..bc13cf6a1f7e 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.54
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.54
@@ -11,5 +11,5 @@ REQUIRED_USE=video_cards_exynos? ( libkms )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.54.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=3d7c5705e9d0c874fe58ab74f5894c3e
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.56 b/metadata/md5-cache/x11-libs/libdrm-2.4.56
index 7fc21cbe4680..ef6c830edbd1 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.56
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.56
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpthread-stubs-0.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.56.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=e28d4d6d1859339d8196cea9cfa4e3b3
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.58 b/metadata/md5-cache/x11-libs/libdrm-2.4.58
index 0e5632e34ffd..727c74f5f672 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.58
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.58
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpthread-stubs-0.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.58.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=b6ede04aef495b133970c6b3c0543700
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.59 b/metadata/md5-cache/x11-libs/libdrm-2.4.59
index 28244392fc75..7c083c15c196 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.59
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.59
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpthread-stubs-0.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.59.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=ffa80554240aa780e4777b9952167a41
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.59-r1 b/metadata/md5-cache/x11-libs/libdrm-2.4.59-r1
index 0d111ab88827..43712b70a41f 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.59-r1
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.59-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpthread-stubs-0.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.59.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=5ed644616983d41c29a1ced287de898c
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.60 b/metadata/md5-cache/x11-libs/libdrm-2.4.60
index 5dd1455c6a1d..a4ac773946c7 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.60
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.60
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpthread-stubs-0.3-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x
 RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.60.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=d142be1e0a9bb0e6c4c77d38b75b344a
diff --git a/metadata/md5-cache/x11-libs/libnotify-0.7.6-r1 b/metadata/md5-cache/x11-libs/libnotify-0.7.6-r1
index 83703e6b7028..4c4fd5fdc0c2 100644
--- a/metadata/md5-cache/x11-libs/libnotify-0.7.6-r1
+++ b/metadata/md5-cache/x11-libs/libnotify-0.7.6-r1
@@ -10,5 +10,5 @@ PDEPEND=virtual/notification-daemon
 RDEPEND=app-eselect/eselect-notify-send >=dev-libs/glib-2.26:2[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(-)?] x11-libs/gdk-pixbuf:2[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(-)?] introspection? ( >=dev-libs/gobject-introspection-1.32 ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20140508-r4 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/libnotify/0.7/libnotify-0.7.6.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	gnome.org	8fef8f967214f56e08fa92d61163d891	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=e1ffea32a16c2389c4a42df79fbb231e
diff --git a/metadata/md5-cache/x11-libs/libpciaccess-0.13.2 b/metadata/md5-cache/x11-libs/libpciaccess-0.13.2
index abeacba7fa29..d28267d8f846 100644
--- a/metadata/md5-cache/x11-libs/libpciaccess-0.13.2
+++ b/metadata/md5-cache/x11-libs/libpciaccess-0.13.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-base/xorg-server-1.5 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(-)?] ) sys-apps/hwids abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.13.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=e48add8c807cdd40959cfa000275315c
diff --git a/metadata/md5-cache/x11-libs/libpciaccess-0.13.3 b/metadata/md5-cache/x11-libs/libpciaccess-0.13.3
index 7dafc0f8d87a..466c8ff8fb2a 100644
--- a/metadata/md5-cache/x11-libs/libpciaccess-0.13.3
+++ b/metadata/md5-cache/x11-libs/libpciaccess-0.13.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-base/xorg-server-1.5 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(-)?] ) sys-apps/hwids abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.13.3.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=37fe9afa1b48caf222b1c35fa2cd08fe
diff --git a/metadata/md5-cache/x11-libs/libva-1.3.1 b/metadata/md5-cache/x11-libs/libva-1.3.1
index c38ab07ed895..f7d9ed27b84f 100644
--- a/metadata/md5-cache/x11-libs/libva-1.3.1
+++ b/metadata/md5-cache/x11-libs/libva-1.3.1
@@ -11,5 +11,5 @@ RDEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=opengl? ( X )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.3.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=30fa8dfa5f50c7bf01284e3f2d7e78bf
diff --git a/metadata/md5-cache/x11-libs/libva-1.4.0 b/metadata/md5-cache/x11-libs/libva-1.4.0
index 4de44795863e..7391c3848e1b 100644
--- a/metadata/md5-cache/x11-libs/libva-1.4.0
+++ b/metadata/md5-cache/x11-libs/libva-1.4.0
@@ -11,5 +11,5 @@ RDEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=opengl? ( X )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.4.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=d997bda9500ed391ab6302864b19d56b
diff --git a/metadata/md5-cache/x11-libs/libva-1.4.1 b/metadata/md5-cache/x11-libs/libva-1.4.1
index 8421ab9e9e9e..9dc06de64e5b 100644
--- a/metadata/md5-cache/x11-libs/libva-1.4.1
+++ b/metadata/md5-cache/x11-libs/libva-1.4.1
@@ -11,5 +11,5 @@ RDEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=opengl? ( X )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.4.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6e42b3c8249519128fef06cf5f6226d9
diff --git a/metadata/md5-cache/x11-libs/libva-1.5.0 b/metadata/md5-cache/x11-libs/libva-1.5.0
index a42d062434dc..d4637315d9c6 100644
--- a/metadata/md5-cache/x11-libs/libva-1.5.0
+++ b/metadata/md5-cache/x11-libs/libva-1.5.0
@@ -11,5 +11,5 @@ RDEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=opengl? ( X )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.5.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=bf5598d6b9bd418875c604c2011bcf0b
diff --git a/metadata/md5-cache/x11-libs/libva-1.5.1 b/metadata/md5-cache/x11-libs/libva-1.5.1
index a00d2419244d..0caf00a57c3f 100644
--- a/metadata/md5-cache/x11-libs/libva-1.5.1
+++ b/metadata/md5-cache/x11-libs/libva-1.5.1
@@ -11,5 +11,5 @@ RDEPEND=>=x11-libs/libdrm-2.4.46[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 REQUIRED_USE=opengl? ( X )
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva/libva-1.5.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=ee822887c0454a2cde33c931de7b0554
diff --git a/metadata/md5-cache/x11-libs/libva-9999 b/metadata/md5-cache/x11-libs/libva-9999
index 610a448d3704..501366655c75 100644
--- a/metadata/md5-cache/x11-libs/libva-9999
+++ b/metadata/md5-cache/x11-libs/libva-9999
@@ -9,5 +9,5 @@ PDEPEND=video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[abi_x86_32(
 RDEPEND=>=x11-libs/libdrm-2.4.46[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(-)?] X? ( >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXfixes-5.0.1[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(-)?] ) egl? ( >=media-libs/mesa-9.1.6[egl,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(-)?] ) opengl? ( >=virtual/opengl-7.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(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[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(-)?] )
 REQUIRED_USE=opengl? ( X )
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e85751ab4111cdb9a532a0846e1d4c46
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.3.0 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.3.0
index e07a39cec78a..f15ecad2f1d6 100644
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-1.3.0
+++ b/metadata/md5-cache/x11-libs/libva-intel-driver-1.3.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libva-1.3.0[X?,wayland?,drm?,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(-)?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.46[video_cards_intel,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(-)?] wayland? ( >=media-libs/mesa-9.1.6[egl,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(-)?] >=dev-libs/wayland-1.0.6[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
 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-1.3.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=84542e4c687fe36b5a9c1a24524cafde
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.4.1 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.4.1
index 6b1e3cf958a2..078e5551dcc0 100644
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-1.4.1
+++ b/metadata/md5-cache/x11-libs/libva-intel-driver-1.4.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libva-1.4[X?,wayland?,drm?,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(-)?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.46[video_cards_intel,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(-)?] wayland? ( >=media-libs/mesa-9.1.6[egl,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(-)?] >=dev-libs/wayland-1.0.6[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
 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-1.4.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=de3870bf5fd43c17b1ac2bc7706f9cd5
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.5.0 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.5.0
index ec02b864dd27..a9e28a708fac 100644
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-1.5.0
+++ b/metadata/md5-cache/x11-libs/libva-intel-driver-1.5.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libva-1.4[X?,wayland?,drm?,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(-)?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.46[video_cards_intel,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(-)?] wayland? ( >=media-libs/mesa-9.1.6[egl,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(-)?] >=dev-libs/wayland-1.0.6[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
 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-1.5.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=9f91c46b73a9d08b5502c9730951e167
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-1.5.1 b/metadata/md5-cache/x11-libs/libva-intel-driver-1.5.1
index 589d616b2beb..5349e938cd51 100644
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-1.5.1
+++ b/metadata/md5-cache/x11-libs/libva-intel-driver-1.5.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libva-1.4[X?,wayland?,drm?,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(-)?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.46[video_cards_intel,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(-)?] wayland? ( >=media-libs/mesa-9.1.6[egl,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(-)?] >=dev-libs/wayland-1.0.6[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
 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/libva-intel-driver-1.5.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f07518607b43ca8cb5d3b0897a1d1cdc
diff --git a/metadata/md5-cache/x11-libs/libva-intel-driver-9999 b/metadata/md5-cache/x11-libs/libva-intel-driver-9999
index 8714b28d28ec..7c0eb259a944 100644
--- a/metadata/md5-cache/x11-libs/libva-intel-driver-9999
+++ b/metadata/md5-cache/x11-libs/libva-intel-driver-9999
@@ -7,5 +7,5 @@ IUSE=+drm wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64
 LICENSE=MIT
 RDEPEND=>=x11-libs/libva-1.4[X?,wayland?,drm?,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(-)?] !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.46[video_cards_intel,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(-)?] wayland? ( >=media-libs/mesa-9.1.6[egl,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(-)?] >=dev-libs/wayland-1.0.6[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
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=9891390b26f357ec682fc85159d142c3
diff --git a/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.4-r2 b/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.4-r2
index 42e544e581cd..3ee5b91dc351 100644
--- a/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.4-r2
+++ b/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.4-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/libva-1.2.1-r1[X,opengl?,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(-)?] opengl? ( >=virtual/opengl-7.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(-)?] ) >=x11-libs/libvdpau-0.8[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(-)?] !x11-libs/vdpau-video
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/libva-vdpau-driver-0.7.4.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=cd2281ac1275fc3c73d98f4c5ffd49ae
diff --git a/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.4-r3 b/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.4-r3
index ed5918433cb0..e039604d49d1 100644
--- a/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.4-r3
+++ b/metadata/md5-cache/x11-libs/libva-vdpau-driver-0.7.4-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=x11-libs/libva-1.2.1-r1[X,opengl?,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(-)?] opengl? ( >=virtual/opengl-7.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(-)?] ) >=x11-libs/libvdpau-0.8[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(-)?] !x11-libs/vdpau-video
 SLOT=0
 SRC_URI=http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/libva-vdpau-driver-0.7.4.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=26aabd71d3a1c15beab56ff31db63aea
diff --git a/metadata/md5-cache/x11-libs/libva-vdpau-driver-9999 b/metadata/md5-cache/x11-libs/libva-vdpau-driver-9999
index 4b856ab7e16e..be73d1efcc80 100644
--- a/metadata/md5-cache/x11-libs/libva-vdpau-driver-9999
+++ b/metadata/md5-cache/x11-libs/libva-vdpau-driver-9999
@@ -7,5 +7,5 @@ IUSE=debug opengl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 ab
 LICENSE=GPL-2
 RDEPEND=>=x11-libs/libva-1.2.1-r1[X,opengl?,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(-)?] opengl? ( >=virtual/opengl-7.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(-)?] ) >=x11-libs/libvdpau-0.7[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(-)?] !x11-libs/vdpau-video
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=e3e66d5506054b4e4cbf87fedf30d9fb
diff --git a/metadata/md5-cache/x11-libs/libvdpau-0.7 b/metadata/md5-cache/x11-libs/libvdpau-0.7
index 23e923f6a76a..2994c60a059a 100644
--- a/metadata/md5-cache/x11-libs/libvdpau-0.7
+++ b/metadata/md5-cache/x11-libs/libvdpau-0.7
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] dri? ( >=x11-libs/libXext-1.3.2[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(-)?] ) !=x11-drivers/nvidia-drivers-180* !=x11-drivers/nvidia-drivers-185* !=x11-drivers/nvidia-drivers-190* abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://people.freedesktop.org/~aplattner/vdpau/libvdpau-0.7.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=df9eca7cc2488fb6fa4a30a20edc12e7
diff --git a/metadata/md5-cache/x11-libs/libvdpau-0.8 b/metadata/md5-cache/x11-libs/libvdpau-0.8
index dc594f1ff8ad..2464a51fba1d 100644
--- a/metadata/md5-cache/x11-libs/libvdpau-0.8
+++ b/metadata/md5-cache/x11-libs/libvdpau-0.8
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] dri? ( >=x11-libs/libXext-1.3.2[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(-)?] ) !=x11-drivers/nvidia-drivers-180* !=x11-drivers/nvidia-drivers-185* !=x11-drivers/nvidia-drivers-190* abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://people.freedesktop.org/~aplattner/vdpau/libvdpau-0.8.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=2ab3a99828e3099348f6b42c5856f23c
diff --git a/metadata/md5-cache/x11-libs/libvdpau-0.9 b/metadata/md5-cache/x11-libs/libvdpau-0.9
index 05181d1fb56b..d6b0e21e598f 100644
--- a/metadata/md5-cache/x11-libs/libvdpau-0.9
+++ b/metadata/md5-cache/x11-libs/libvdpau-0.9
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libX11-1.6.2[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(-)?] dri? ( >=x11-libs/libXext-1.3.2[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(-)?] ) !=x11-drivers/nvidia-drivers-180* !=x11-drivers/nvidia-drivers-185* !=x11-drivers/nvidia-drivers-190* abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://people.freedesktop.org/~aplattner/vdpau/libvdpau-0.9.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
 _md5_=47a1622fa86f04951141e4e5ce1aed57
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.10 b/metadata/md5-cache/x11-libs/libxcb-1.10
index 197ad8d5f122..4bdee654dbe3 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.10
+++ b/metadata/md5-cache/x11-libs/libxcb-1.10
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libpthread-stubs-0.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(-)?] >=x11-libs/libXau-1.0.7-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(-)?] >=x11-libs/libXdmcp-1.1.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.10.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=d68c9ac06851002c6909c93821a721fc
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.11 b/metadata/md5-cache/x11-libs/libxcb-1.11
index 3e8c2e617a1d..44286ac004c0 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.11
+++ b/metadata/md5-cache/x11-libs/libxcb-1.11
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libpthread-stubs-0.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(-)?] >=x11-libs/libXau-1.0.7-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(-)?] >=x11-libs/libXdmcp-1.1.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0/1.11
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.11.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=eb3e76530726c263d7a7f15e59104c52
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.11-r1 b/metadata/md5-cache/x11-libs/libxcb-1.11-r1
index 1b32e169b93c..b101c87eb765 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.11-r1
+++ b/metadata/md5-cache/x11-libs/libxcb-1.11-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libpthread-stubs-0.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(-)?] >=x11-libs/libXau-1.0.7-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(-)?] >=x11-libs/libXdmcp-1.1.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0/1.11
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.11.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=7a244f3cfc288c2bfb08c7f41107aaf2
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.9.1 b/metadata/md5-cache/x11-libs/libxcb-1.9.1
index 5396db719136..967eb31e2fb2 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.9.1
+++ b/metadata/md5-cache/x11-libs/libxcb-1.9.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpthread-stubs-0.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python2_7? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.9.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=dec40df365cb3e84598ca997682581b5
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.9.1-r1 b/metadata/md5-cache/x11-libs/libxcb-1.9.1-r1
index 90700f3708a2..cff1c73f65e6 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.9.1-r1
+++ b/metadata/md5-cache/x11-libs/libxcb-1.9.1-r1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpthread-stubs-0.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python2_7? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.9.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=e8a9afb56f67f9dd674b545f2008e0a3
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.9.3 b/metadata/md5-cache/x11-libs/libxcb-1.9.3
index 92405ef8713e..8766ea5837d7 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.9.3
+++ b/metadata/md5-cache/x11-libs/libxcb-1.9.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/libpthread-stubs-0.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 REQUIRED_USE=^^ ( python_single_target_python3_3 python_single_target_python2_7 ) python_single_target_python3_3? ( python_targets_python3_3 ) python_single_target_python2_7? ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.9.3.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-single-r1	7a178335dbd6ea7f50ed4e3e1c13c1e4	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=f26ccf029d0a0b3f88b750268cf572a4
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.9.3-r1 b/metadata/md5-cache/x11-libs/libxcb-1.9.3-r1
index 30b4261f774a..6dfdcf02ac09 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.9.3-r1
+++ b/metadata/md5-cache/x11-libs/libxcb-1.9.3-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=dev-libs/libpthread-stubs-0.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(-)?] >=x11-libs/libXau-1.0.7-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(-)?] >=x11-libs/libXdmcp-1.1.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/libxcb-1.9.3.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=dd0dc584cdeb718d9aee060273f5dc88
diff --git a/metadata/md5-cache/x11-libs/libxkbcommon-0.4.1 b/metadata/md5-cache/x11-libs/libxkbcommon-0.4.1
index efe6f80620bb..b787e9bcf3c1 100644
--- a/metadata/md5-cache/x11-libs/libxkbcommon-0.4.1
+++ b/metadata/md5-cache/x11-libs/libxkbcommon-0.4.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xkbcommon.org/download/libxkbcommon-0.4.1.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=a4461383c181659a827906150009e086
diff --git a/metadata/md5-cache/x11-libs/libxkbcommon-0.5.0 b/metadata/md5-cache/x11-libs/libxkbcommon-0.5.0
index 4c83acd01765..c5ba8e1d8c7e 100644
--- a/metadata/md5-cache/x11-libs/libxkbcommon-0.5.0
+++ b/metadata/md5-cache/x11-libs/libxkbcommon-0.5.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xkbcommon.org/download/libxkbcommon-0.5.0.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=f29f76a2afd7afd61211339b00dd2dd4
diff --git a/metadata/md5-cache/x11-libs/libxshmfence-1.1 b/metadata/md5-cache/x11-libs/libxshmfence-1.1
index 903d2d9d1908..a4d245a5c476 100644
--- a/metadata/md5-cache/x11-libs/libxshmfence-1.1
+++ b/metadata/md5-cache/x11-libs/libxshmfence-1.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libxshmfence-1.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=7d61f1061a89938cd718153b1d5fa16c
diff --git a/metadata/md5-cache/x11-libs/libxshmfence-1.2 b/metadata/md5-cache/x11-libs/libxshmfence-1.2
index 2ae8510e69b0..3b2944035667 100644
--- a/metadata/md5-cache/x11-libs/libxshmfence-1.2
+++ b/metadata/md5-cache/x11-libs/libxshmfence-1.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libxshmfence-1.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=e3ee3a31b231d6d61761613d14499d0f
diff --git a/metadata/md5-cache/x11-libs/motif-2.2.3-r12 b/metadata/md5-cache/x11-libs/motif-2.2.3-r12
index bc16b8b04435..b0535464309a 100644
--- a/metadata/md5-cache/x11-libs/motif-2.2.3-r12
+++ b/metadata/md5-cache/x11-libs/motif-2.2.3-r12
@@ -9,5 +9,5 @@ LICENSE=MOTIF MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] ) >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXmu-1.1.1-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(-)?] >=x11-libs/libXp-1.0.2[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(-)?] >=x11-libs/libXt-1.1.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(-)?]
 SLOT=2.2
 SRC_URI=ftp://ftp.ics.com/openmotif/2.2/2.2.3/src/openMotif-2.2.3.tar.gz mirror://gentoo/openmotif-2.2.3-patches-5.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7aab65f5268aa8b04d35b9efb488d10e
diff --git a/metadata/md5-cache/x11-libs/motif-2.3.4-r3 b/metadata/md5-cache/x11-libs/motif-2.3.4-r3
index 4c81fbbe508b..c9128a2bbc94 100644
--- a/metadata/md5-cache/x11-libs/motif-2.3.4-r3
+++ b/metadata/md5-cache/x11-libs/motif-2.3.4-r3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+ MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] ) >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXext-1.3.2[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(-)?] >=x11-libs/libXmu-1.1.1-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(-)?] >=x11-libs/libXp-1.0.2[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(-)?] >=x11-libs/libXt-1.1.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(-)?] jpeg? ( >=virtual/jpeg-0-r2: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(-)?] ) png? ( >=media-libs/libpng-1.6.10: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(-)?] ) unicode? ( >=virtual/libiconv-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(-)?] ) xft? ( >=media-libs/fontconfig-2.10.92[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(-)?] >=x11-libs/libXft-2.3.1-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
 SRC_URI=mirror://sourceforge/project/motif/Motif%202.3.4%20Source%20Code/motif-2.3.4-src.tgz mirror://gentoo/motif-2.3.4-patches-1.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7898098e57496aca4c15900476a1aa6e
diff --git a/metadata/md5-cache/x11-libs/pango-1.36.5 b/metadata/md5-cache/x11-libs/pango-1.36.5
index 0c12b602800f..f23d541da359 100644
--- a/metadata/md5-cache/x11-libs/pango-1.36.5
+++ b/metadata/md5-cache/x11-libs/pango-1.36.5
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ FTL
 RDEPEND=>=media-libs/harfbuzz-0.9.12:=[glib(+),truetype(+),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(-)?] >=dev-libs/glib-2.34.3:2[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(-)?] >=media-libs/fontconfig-2.10.92:1.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(-)?] >=media-libs/freetype-2.5.0.1:2=[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(-)?] >=x11-libs/cairo-1.12.14-r4:=[X?,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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) X? ( >=x11-libs/libXrender-0.9.8[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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXft-2.3.1-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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008-r3 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pango/1.36/pango-1.36.5.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=da253d7645dcb393d06d72f956d3e5a3
diff --git a/metadata/md5-cache/x11-libs/pango-1.36.7 b/metadata/md5-cache/x11-libs/pango-1.36.7
index 536f46d15658..49663530e4ce 100644
--- a/metadata/md5-cache/x11-libs/pango-1.36.7
+++ b/metadata/md5-cache/x11-libs/pango-1.36.7
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ FTL
 RDEPEND=>=media-libs/harfbuzz-0.9.12:=[glib(+),truetype(+),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(-)?] >=dev-libs/glib-2.34.3:2[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(-)?] >=media-libs/fontconfig-2.10.92:1.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(-)?] >=media-libs/freetype-2.5.0.1:2=[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(-)?] >=x11-libs/cairo-1.12.14-r4:=[X?,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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) X? ( >=x11-libs/libXrender-0.9.8[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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXft-2.3.1-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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008-r3 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pango/1.36/pango-1.36.7.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6968cf2cf3918715512df4d9e2316cce
diff --git a/metadata/md5-cache/x11-libs/pango-1.36.8 b/metadata/md5-cache/x11-libs/pango-1.36.8
index 506b7d68f60c..6d88db8bf024 100644
--- a/metadata/md5-cache/x11-libs/pango-1.36.8
+++ b/metadata/md5-cache/x11-libs/pango-1.36.8
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ FTL
 RDEPEND=>=media-libs/harfbuzz-0.9.12:=[glib(+),truetype(+),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(-)?] >=dev-libs/glib-2.34.3:2[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(-)?] >=media-libs/fontconfig-2.10.92:1.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(-)?] >=media-libs/freetype-2.5.0.1:2=[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(-)?] >=x11-libs/cairo-1.12.14-r4:=[X?,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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) X? ( >=x11-libs/libXrender-0.9.8[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(-)?] >=x11-libs/libX11-1.6.2[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(-)?] >=x11-libs/libXft-2.3.1-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(-)?] ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008-r3 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pango/1.36/pango-1.36.8.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=6de3d60ffbff26cf24d273e83f595adc
diff --git a/metadata/md5-cache/x11-libs/pangox-compat-0.0.2-r1 b/metadata/md5-cache/x11-libs/pangox-compat-0.0.2-r1
index 1082cbab4c06..592bbd30bedf 100644
--- a/metadata/md5-cache/x11-libs/pangox-compat-0.0.2-r1
+++ b/metadata/md5-cache/x11-libs/pangox-compat-0.0.2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.34.3:2[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(-)?] >=x11-libs/pango-1.36.3[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(-)?] >=x11-libs/libX11-1.6.2[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-gtklibs-20131008-r3 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pangox-compat/0.0/pangox-compat-0.0.2.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=1b87c01e27d7889918a14a4e3fc2121a
diff --git a/metadata/md5-cache/x11-libs/pixman-0.32.4 b/metadata/md5-cache/x11-libs/pixman-0.32.4
index 09a54fd39e22..3191b18247f0 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.32.4
+++ b/metadata/md5-cache/x11-libs/pixman-0.32.4
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/pixman-0.32.4.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=3eb99708944e61f17fc80c527196e7ed
diff --git a/metadata/md5-cache/x11-libs/pixman-0.32.6 b/metadata/md5-cache/x11-libs/pixman-0.32.6
index feb5ae0d81bf..bfd723700933 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.32.6
+++ b/metadata/md5-cache/x11-libs/pixman-0.32.6
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-gtklibs-20131008 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] ) abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/pixman-0.32.6.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=fedd7eec85ddac15fda46033f9a31a57
diff --git a/metadata/md5-cache/x11-libs/tslib-1.0-r3 b/metadata/md5-cache/x11-libs/tslib-1.0-r3
index 0a1009b2c924..25a2a860a438 100644
--- a/metadata/md5-cache/x11-libs/tslib-1.0-r3
+++ b/metadata/md5-cache/x11-libs/tslib-1.0-r3
@@ -8,5 +8,5 @@ KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=LGPL-2
 SLOT=0
 SRC_URI=http://dev.gentoo.org/~mgorny/dist/tslib-1.0.tar.bz2 mirror://gentoo/tslib-1.0-patches-5.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=dc958b3cacc065f0d883fc6f74472452
diff --git a/metadata/md5-cache/x11-libs/xcb-util-0.3.9-r1 b/metadata/md5-cache/x11-libs/xcb-util-0.3.9-r1
index 22be245cc7b9..b98c83778de2 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-0.3.9-r1
+++ b/metadata/md5-cache/x11-libs/xcb-util-0.3.9-r1
@@ -10,5 +10,5 @@ PDEPEND=>=x11-libs/xcb-util-image-0.3.9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RDEPEND=>=x11-libs/libxcb-1.9.1[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(-)?] >=x11-proto/xproto-7.0.24[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-0.3.9.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=f7fbe5101ddf6f0f96f3550f7681e45e
diff --git a/metadata/md5-cache/x11-libs/xcb-util-0.4.0 b/metadata/md5-cache/x11-libs/xcb-util-0.4.0
index 0abf0e6a5351..00bc175dedc5 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-0.4.0
+++ b/metadata/md5-cache/x11-libs/xcb-util-0.4.0
@@ -10,5 +10,5 @@ PDEPEND=>=x11-libs/xcb-util-cursor-0.1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86
 RDEPEND=>=x11-libs/libxcb-1.9.1:=[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(-)?] >=x11-proto/xproto-7.0.24:=[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-0.4.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=ee1e1b80f8c7ad34c86fc2dc52856c4f
diff --git a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.1-r1 b/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.1-r1
index cb55f5c1527c..906c563dd4f7 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.1-r1
+++ b/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.9.1[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(-)?] >=x11-libs/xcb-util-image-0.3.9-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(-)?] >=x11-libs/xcb-util-renderutil-0.3.9[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(-)?] >=x11-proto/xcb-proto-1.8-r3:=[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(-)?] >=x11-proto/xproto-7.0.24:=[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-cursor-0.1.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=9cd5d520e0ec49e793439aadf27aa1ea
diff --git a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.2 b/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.2
index 9fe12953a5de..b321ef530d04 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.2
+++ b/metadata/md5-cache/x11-libs/xcb-util-cursor-0.1.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.9.1[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(-)?] >=x11-libs/xcb-util-image-0.3.9-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(-)?] >=x11-libs/xcb-util-renderutil-0.3.9[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(-)?] >=x11-proto/xcb-proto-1.8-r3:=[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(-)?] >=x11-proto/xproto-7.0.24:=[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-cursor-0.1.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=c3cb405ed2267547c5b22863ad02bef3
diff --git a/metadata/md5-cache/x11-libs/xcb-util-image-0.3.9-r1 b/metadata/md5-cache/x11-libs/xcb-util-image-0.3.9-r1
index c96e5f06c9b8..2172434c5fb4 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-image-0.3.9-r1
+++ b/metadata/md5-cache/x11-libs/xcb-util-image-0.3.9-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/xcb-util-0.3.9[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(-)?] >=x11-proto/xproto-7.0.24[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-image-0.3.9.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=99e0ea3e7d1b792c517532a24cd107c4
diff --git a/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0 b/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0
index b5a9d0f78e29..5e23e1d18f71 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0
+++ b/metadata/md5-cache/x11-libs/xcb-util-image-0.4.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.9.1:=[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(-)?] >=x11-libs/xcb-util-0.4.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(-)?] >=x11-proto/xproto-7.0.24:=[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-image-0.4.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=e3bdc167ce405e4743bb11775fb6e785
diff --git a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.9-r1 b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.9-r1
index d99ea7889a1d..6f29cbc7494c 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.9-r1
+++ b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.3.9-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/xcb-util-0.3.9[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(-)?] >=x11-proto/xproto-7.0.24[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-keysyms-0.3.9.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=852b05cdfee845059b6d3f148b250741
diff --git a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0 b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0
index 9d1c61cfcceb..f8187452db20 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0
+++ b/metadata/md5-cache/x11-libs/xcb-util-keysyms-0.4.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=x11-libs/libxcb:=[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(-)?] >=x11-proto/xproto-7.0.24:=[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-keysyms-0.4.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=4cbc7ba4c40b21923555728324d800ed
diff --git a/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r1 b/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r1
index 98de8ec166c8..2c5511102a93 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r1
+++ b/metadata/md5-cache/x11-libs/xcb-util-renderutil-0.3.9-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.9.1:=[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(-)?] >=x11-proto/xproto-7.0.24:=[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-renderutil-0.3.9.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=f9408ed1ed6df847f28b2ef2eb11a8b4
diff --git a/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r1 b/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r1
index ebda61211560..4860c3bae82d 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r1
+++ b/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-libs/libxcb-1.9.1:=[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(-)?] >=x11-proto/xproto-7.0.24:=[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-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist//xcb-util-wm-0.4.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=7e33f49c6ae5d315d0b0512409034284
diff --git a/metadata/md5-cache/x11-libs/xvba-video-0.8.0-r3 b/metadata/md5-cache/x11-libs/xvba-video-0.8.0-r3
index 8579e8a44530..54de862074c1 100644
--- a/metadata/md5-cache/x11-libs/xvba-video-0.8.0-r3
+++ b/metadata/md5-cache/x11-libs/xvba-video-0.8.0-r3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ MIT
 RDEPEND=>=x11-libs/libva-1.2.1-r1[X(+),opengl?,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(-)?] >=x11-libs/libvdpau-0.7[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
 SRC_URI=http://dev.gentooexperimental.org/~scarabeus/xvba-driver-0.8.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=6dd517d01c147b15364189f7d8bce640
diff --git a/metadata/md5-cache/x11-libs/xvba-video-9999 b/metadata/md5-cache/x11-libs/xvba-video-9999
index 16b245b27dcf..9ab8757a2154 100644
--- a/metadata/md5-cache/x11-libs/xvba-video-9999
+++ b/metadata/md5-cache/x11-libs/xvba-video-9999
@@ -7,5 +7,5 @@ IUSE=debug opengl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 ab
 LICENSE=GPL-2+ MIT
 RDEPEND=>=x11-libs/libva-1.2.1-r1[X(+),opengl?,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(-)?] >=x11-libs/libvdpau-0.7[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(-)?] x11-drivers/ati-drivers
 SLOT=0
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	git-2	e28f0d8a9b321431b1e699782851b827	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-any-r1	da352ea9da8eb9bf158d56cca65d6c82	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=c95e4f2420eee13c7b47c2472f4ccd30
diff --git a/metadata/md5-cache/x11-misc/alock-60-r3 b/metadata/md5-cache/x11-misc/alock-60-r3
deleted file mode 100644
index c453fe25e582..000000000000
--- a/metadata/md5-cache/x11-misc/alock-60-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXcursor imlib? ( media-libs/imlib2[X] ) pam? ( virtual/pam )
-DESCRIPTION=locks the local X display until a password is entered
-EAPI=2
-HOMEPAGE=http://code.google.com/p/alock/ http://darkshed.net/projects/alock
-IUSE=imlib pam
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXcursor imlib? ( media-libs/imlib2[X] ) pam? ( virtual/pam )
-SLOT=0
-SRC_URI=http://alock.googlecode.com/files/alock-svn-60.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=ae96240c37c4354e5a5d52e7f87f1325
diff --git a/metadata/md5-cache/x11-misc/colord-1.2.10 b/metadata/md5-cache/x11-misc/colord-1.2.10
index bd00154c3745..1e1adb42873b 100644
--- a/metadata/md5-cache/x11-misc/colord-1.2.10
+++ b/metadata/md5-cache/x11-misc/colord-1.2.10
@@ -11,5 +11,5 @@ REQUIRED_USE=gusb? ( udev ) scanner? ( udev ) vala? ( introspection )
 RESTRICT=test
 SLOT=0/2
 SRC_URI=http://www.freedesktop.org/software/colord/releases/colord-1.2.10.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=5e5e3ca63393642faf6157414ebdca01
diff --git a/metadata/md5-cache/x11-misc/colord-1.2.9 b/metadata/md5-cache/x11-misc/colord-1.2.9
index 861fdad80339..a0d31e374d13 100644
--- a/metadata/md5-cache/x11-misc/colord-1.2.9
+++ b/metadata/md5-cache/x11-misc/colord-1.2.9
@@ -11,5 +11,5 @@ REQUIRED_USE=gusb? ( udev ) scanner? ( udev ) vala? ( introspection )
 RESTRICT=test
 SLOT=0/2
 SRC_URI=http://www.freedesktop.org/software/colord/releases/colord-1.2.9.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	bash-completion-r1	c8399c7c7ecbcf7ed6e5bd3abb3d4af3	check-reqs	a7f404bfb16e0a996700c5d3ac4edad3	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4	udev	da001465a2e939c93f7ae16947ce3438	user	f54e098dd38ba1c0847a13e685b87747	vala	09bc7da1a93142c9eb90786e6f6b39d2	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=c2be0b4b3d7b8630073093bc4eb112f8
diff --git a/metadata/md5-cache/x11-misc/e16keyedit-0.4 b/metadata/md5-cache/x11-misc/e16keyedit-0.4
deleted file mode 100644
index 20d8dcfdc2ee..000000000000
--- a/metadata/md5-cache/x11-misc/e16keyedit-0.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND==x11-libs/gtk+-2* virtual/pkgconfig
-DESCRIPTION=Key binding editor for enlightenment 16
-HOMEPAGE=http://www.enlightenment.org/
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=MIT-with-advertising
-RDEPEND==x11-libs/gtk+-2*
-SLOT=0
-SRC_URI=mirror://sourceforge/enlightenment/e16utils/e16keyedit-0.4.tar.gz
-_md5_=33bcc1132998c6b3a6f245ac693b8410
diff --git a/metadata/md5-cache/x11-misc/e16keyedit-0.6 b/metadata/md5-cache/x11-misc/e16keyedit-0.6
deleted file mode 100644
index d9337015804e..000000000000
--- a/metadata/md5-cache/x11-misc/e16keyedit-0.6
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND==x11-libs/gtk+-2* virtual/pkgconfig
-DESCRIPTION=Key binding editor for enlightenment 16
-HOMEPAGE=http://www.enlightenment.org/
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=MIT-with-advertising
-RDEPEND==x11-libs/gtk+-2*
-SLOT=0
-SRC_URI=mirror://sourceforge/enlightenment/e16keyedit-0.6.tar.gz
-_md5_=4949f82b306c9973a19ab127059e4201
diff --git a/metadata/md5-cache/x11-misc/grabc-1.1 b/metadata/md5-cache/x11-misc/grabc-1.1
deleted file mode 100644
index 8773c958dc99..000000000000
--- a/metadata/md5-cache/x11-misc/grabc-1.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=x11-libs/libX11 x11-proto/xproto >=sys-apps/sed-4
-DESCRIPTION=determine the color string in hex (or RGB components) by clicking on a pixel on the screen
-HOMEPAGE=http://www.muquit.com/muquit/software/grabc/grabc.html
-KEYWORDS=x86 ppc ppc64 amd64
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=http://www.muquit.com/muquit/software/grabc/grabc1.1.tar.gz
-_md5_=8bbee5b3bc33f93221fa21a303685497
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.3.3 b/metadata/md5-cache/x11-misc/virtualgl-2.3.3
index 9dbae811b6df..e44f8477388c 100644
--- a/metadata/md5-cache/x11-misc/virtualgl-2.3.3
+++ b/metadata/md5-cache/x11-misc/virtualgl-2.3.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
 RDEPEND=ssl? ( dev-libs/openssl[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(-)?] ) media-libs/libjpeg-turbo[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(-)?] x11-libs/libX11[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(-)?] x11-libs/libXext[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(-)?] x11-libs/libXv[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(-)?] virtual/glu[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(-)?] virtual/opengl[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(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/virtualgl/VirtualGL/2.3.3/VirtualGL-2.3.3.tar.gz
-_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=cmake-multilib	ca4c6ecda3062bf851d951987568fdae	cmake-utils	0430c386d85cec959d72640afd63ea91	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	systemd	090342761f573a8280dd5aa6b0345f3b	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=f59b62a63ba61a63edbf0ad0bf69e39d
diff --git a/metadata/md5-cache/x11-plugins/gkrellfire-0.3.3 b/metadata/md5-cache/x11-plugins/gkrellfire-0.3.3
deleted file mode 100644
index e1cc8993cc29..000000000000
--- a/metadata/md5-cache/x11-plugins/gkrellfire-0.3.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND==app-admin/gkrellm-2* virtual/pkgconfig
-DESCRIPTION=Cpu load flames for GKrellM 2
-HOMEPAGE=http://people.freenet.de/thomas-steinke
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND==app-admin/gkrellm-2*
-SLOT=0
-SRC_URI=http://people.freenet.de/thomas-steinke/gkrellfire-0.3.3.tgz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gkrellm-plugin	4599c73f33aed9a9988a7031f60d2ed8	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=8332cd1344ebe389023e8dd8284dfe08
diff --git a/metadata/md5-cache/x11-plugins/wmbiff-0.4.27 b/metadata/md5-cache/x11-plugins/wmbiff-0.4.27
deleted file mode 100644
index 2382a7a76873..000000000000
--- a/metadata/md5-cache/x11-plugins/wmbiff-0.4.27
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=dev-libs/libgcrypt-1.2.1:0 <net-libs/gnutls-3.0 ) virtual/pkgconfig x11-proto/xextproto x11-proto/xproto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes
-EAPI=4
-HOMEPAGE=http://sourceforge.net/projects/wmbiff/
-IUSE=crypt
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=dev-libs/libgcrypt-1.2.1:0 <net-libs/gnutls-3.0 )
-SLOT=0
-SRC_URI=mirror://sourceforge/wmbiff/wmbiff-0.4.27.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=c3f625c234d8d4047cf87a82b94f4156
diff --git a/metadata/md5-cache/x11-plugins/wmbiff-0.4.27-r1 b/metadata/md5-cache/x11-plugins/wmbiff-0.4.27-r1
deleted file mode 100644
index 6c4b19f58004..000000000000
--- a/metadata/md5-cache/x11-plugins/wmbiff-0.4.27-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=dev-libs/libgcrypt-1.2.1:0 >=net-libs/gnutls-1.2.3 ) virtual/pkgconfig x11-proto/xextproto x11-proto/xproto !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes
-EAPI=4
-HOMEPAGE=http://sourceforge.net/projects/wmbiff/
-IUSE=crypt
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=dev-libs/libgcrypt-1.2.1:0 >=net-libs/gnutls-1.2.3 )
-SLOT=0
-SRC_URI=mirror://sourceforge/wmbiff/wmbiff-0.4.27.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=f5106b19f1dd81758099e1ffdb213fb1
diff --git a/metadata/md5-cache/x11-proto/compositeproto-0.4.2-r1 b/metadata/md5-cache/x11-proto/compositeproto-0.4.2-r1
index 9631b54f11ce..e0e83544868a 100644
--- a/metadata/md5-cache/x11-proto/compositeproto-0.4.2-r1
+++ b/metadata/md5-cache/x11-proto/compositeproto-0.4.2-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/compositeproto-0.4.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=a27144457845dda1d6fd0c0fa7e6a3a3
diff --git a/metadata/md5-cache/x11-proto/damageproto-1.2.1-r1 b/metadata/md5-cache/x11-proto/damageproto-1.2.1-r1
index 08a6f9cf3a40..516be7ba15f4 100644
--- a/metadata/md5-cache/x11-proto/damageproto-1.2.1-r1
+++ b/metadata/md5-cache/x11-proto/damageproto-1.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/damageproto-1.2.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=5f38166c90461a197bdf7b94bd028f12
diff --git a/metadata/md5-cache/x11-proto/dri2proto-2.8-r1 b/metadata/md5-cache/x11-proto/dri2proto-2.8-r1
index bcb9a7bbca72..a5c125a1e3cb 100644
--- a/metadata/md5-cache/x11-proto/dri2proto-2.8-r1
+++ b/metadata/md5-cache/x11-proto/dri2proto-2.8-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.8.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=3a982673cb28616f210dbb2796552eeb
diff --git a/metadata/md5-cache/x11-proto/dri3proto-1.0 b/metadata/md5-cache/x11-proto/dri3proto-1.0
index fabfa78e4dff..dd52a5eaf5bd 100644
--- a/metadata/md5-cache/x11-proto/dri3proto-1.0
+++ b/metadata/md5-cache/x11-proto/dri3proto-1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/dri3proto-1.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=97ae0f4d86ab4d179f23722dd2902705
diff --git a/metadata/md5-cache/x11-proto/fixesproto-5.0-r1 b/metadata/md5-cache/x11-proto/fixesproto-5.0-r1
index 5107835e1ac9..5a06cb816965 100644
--- a/metadata/md5-cache/x11-proto/fixesproto-5.0-r1
+++ b/metadata/md5-cache/x11-proto/fixesproto-5.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=x11-proto/xextproto-7.2.1-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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/fixesproto-5.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=bca37fd5c2570e1ed4e3f20bc6c662c6
diff --git a/metadata/md5-cache/x11-proto/glproto-1.4.16-r1 b/metadata/md5-cache/x11-proto/glproto-1.4.16-r1
index 01fff6401261..aaa634424c45 100644
--- a/metadata/md5-cache/x11-proto/glproto-1.4.16-r1
+++ b/metadata/md5-cache/x11-proto/glproto-1.4.16-r1
@@ -9,5 +9,5 @@ LICENSE=SGI-B-2.0
 RDEPEND=>=app-eselect/eselect-opengl-1.2.6 abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.16.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=a8ed4000f0f29d582d57dc94415945fe
diff --git a/metadata/md5-cache/x11-proto/glproto-1.4.17 b/metadata/md5-cache/x11-proto/glproto-1.4.17
index 441cf4d4089a..e3558b1e4424 100644
--- a/metadata/md5-cache/x11-proto/glproto-1.4.17
+++ b/metadata/md5-cache/x11-proto/glproto-1.4.17
@@ -9,5 +9,5 @@ LICENSE=SGI-B-2.0
 RDEPEND=>=app-eselect/eselect-opengl-1.2.6 abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.17.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=261800bb2cb30d67f72ade2b8755e4da
diff --git a/metadata/md5-cache/x11-proto/glproto-1.4.17-r1 b/metadata/md5-cache/x11-proto/glproto-1.4.17-r1
index c1cd15311fe7..bfd4af9b4a3d 100644
--- a/metadata/md5-cache/x11-proto/glproto-1.4.17-r1
+++ b/metadata/md5-cache/x11-proto/glproto-1.4.17-r1
@@ -9,5 +9,5 @@ LICENSE=SGI-B-2.0
 RDEPEND=>=app-eselect/eselect-opengl-1.3.0 abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.17.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=5b8b1a5b99d6f22f2ab0f3c96b64d621
diff --git a/metadata/md5-cache/x11-proto/inputproto-2.3 b/metadata/md5-cache/x11-proto/inputproto-2.3
index 028cb8c40e13..fe8f83664b11 100644
--- a/metadata/md5-cache/x11-proto/inputproto-2.3
+++ b/metadata/md5-cache/x11-proto/inputproto-2.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.3.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=a3bc0fe740c564072da2c9e604afa3e5
diff --git a/metadata/md5-cache/x11-proto/inputproto-2.3.1 b/metadata/md5-cache/x11-proto/inputproto-2.3.1
index d16244152314..db8eb48fad03 100644
--- a/metadata/md5-cache/x11-proto/inputproto-2.3.1
+++ b/metadata/md5-cache/x11-proto/inputproto-2.3.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/inputproto-2.3.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=6876337683280214c218f590684fe52c
diff --git a/metadata/md5-cache/x11-proto/kbproto-1.0.6-r1 b/metadata/md5-cache/x11-proto/kbproto-1.0.6-r1
index f6da8e616611..5e3123ac8c14 100644
--- a/metadata/md5-cache/x11-proto/kbproto-1.0.6-r1
+++ b/metadata/md5-cache/x11-proto/kbproto-1.0.6-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/kbproto-1.0.6.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=6242c0ba2fb09f34d46ff0df61e8c68c
diff --git a/metadata/md5-cache/x11-proto/presentproto-1.0 b/metadata/md5-cache/x11-proto/presentproto-1.0
index debabc193e95..4f5b14b64b86 100644
--- a/metadata/md5-cache/x11-proto/presentproto-1.0
+++ b/metadata/md5-cache/x11-proto/presentproto-1.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/presentproto-1.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=376ade75b7b6e81c8516208f9a8f59ec
diff --git a/metadata/md5-cache/x11-proto/printproto-1.0.5-r1 b/metadata/md5-cache/x11-proto/printproto-1.0.5-r1
index d009cacbeda5..4c9d2088b6b4 100644
--- a/metadata/md5-cache/x11-proto/printproto-1.0.5-r1
+++ b/metadata/md5-cache/x11-proto/printproto-1.0.5-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/printproto-1.0.5.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=f92f11ea0d8231306d942e169f1923c0
diff --git a/metadata/md5-cache/x11-proto/randrproto-1.4.0-r1 b/metadata/md5-cache/x11-proto/randrproto-1.4.0-r1
index e03e777b3a49..3c4f1eb2ac61 100644
--- a/metadata/md5-cache/x11-proto/randrproto-1.4.0-r1
+++ b/metadata/md5-cache/x11-proto/randrproto-1.4.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/randrproto-1.4.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=587a26e09471eb8c0c33d47d8567128b
diff --git a/metadata/md5-cache/x11-proto/randrproto-1.4.1 b/metadata/md5-cache/x11-proto/randrproto-1.4.1
index 07895aecb616..fad7e59c7a93 100644
--- a/metadata/md5-cache/x11-proto/randrproto-1.4.1
+++ b/metadata/md5-cache/x11-proto/randrproto-1.4.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/randrproto-1.4.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=6407843d01f0ce4c2ccb41bfda8f7240
diff --git a/metadata/md5-cache/x11-proto/recordproto-1.14.2-r1 b/metadata/md5-cache/x11-proto/recordproto-1.14.2-r1
index 48bcfa1fbb02..f02aba3344a5 100644
--- a/metadata/md5-cache/x11-proto/recordproto-1.14.2-r1
+++ b/metadata/md5-cache/x11-proto/recordproto-1.14.2-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXtst-1.0.99.2 abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/recordproto-1.14.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=909b276c464cd7ca41e54207c53eb0ee
diff --git a/metadata/md5-cache/x11-proto/renderproto-0.11.1-r1 b/metadata/md5-cache/x11-proto/renderproto-0.11.1-r1
index 74ab75d3a7af..779754a3616e 100644
--- a/metadata/md5-cache/x11-proto/renderproto-0.11.1-r1
+++ b/metadata/md5-cache/x11-proto/renderproto-0.11.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/renderproto-0.11.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=1887f55df10e25a2693db632fd42c87a
diff --git a/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2-r1 b/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2-r1
index 5f27781d3672..c47bc8a9db13 100644
--- a/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2-r1
+++ b/metadata/md5-cache/x11-proto/scrnsaverproto-1.2.2-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXScrnSaver-1.2 abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/scrnsaverproto-1.2.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=713b37c386a2f164a6680201547ce290
diff --git a/metadata/md5-cache/x11-proto/videoproto-2.3.2 b/metadata/md5-cache/x11-proto/videoproto-2.3.2
index 304d7a6623ed..77edc630c3f7 100644
--- a/metadata/md5-cache/x11-proto/videoproto-2.3.2
+++ b/metadata/md5-cache/x11-proto/videoproto-2.3.2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/videoproto-2.3.2.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=c799716231941c61329c13ed88ce8bfa
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.10 b/metadata/md5-cache/x11-proto/xcb-proto-1.10
index 5e67a7ff12b1..a315327c2772 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.10
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.10
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.10.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=0c28727b743401a7d5f64378a9b80917
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.11 b/metadata/md5-cache/x11-proto/xcb-proto-1.11
index ac769760a723..ff7d8024faa9 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.11
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.11
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targ
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.11.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=2ead21b995b63354f36aa6f2a4dff1a3
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.8-r3 b/metadata/md5-cache/x11-proto/xcb-proto-1.8-r3
index 30c9994a9ac5..1069cbf5f790 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.8-r3
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.8-r3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.8.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=8e3bf525b653a37bc07ba490c3ba7b0c
diff --git a/metadata/md5-cache/x11-proto/xcb-proto-1.9-r1 b/metadata/md5-cache/x11-proto/xcb-proto-1.9-r1
index c5f1c0540f93..5573bdc68332 100644
--- a/metadata/md5-cache/x11-proto/xcb-proto-1.9-r1
+++ b/metadata/md5-cache/x11-proto/xcb-proto-1.9-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)] abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xcb.freedesktop.org/dist/xcb-proto-1.9.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	python-r1	6d3a3cb5705b9fff1aeb7cfa4e3336fe	python-utils-r1	096f8247eae93026af13ab88cf4305cd	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=fb523046642ec610f4780138cd077e36
diff --git a/metadata/md5-cache/x11-proto/xextproto-7.2.1-r1 b/metadata/md5-cache/x11-proto/xextproto-7.2.1-r1
index b8cc3ea1a96d..ea02beeed84e 100644
--- a/metadata/md5-cache/x11-proto/xextproto-7.2.1-r1
+++ b/metadata/md5-cache/x11-proto/xextproto-7.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXext-1.0.99 abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.2.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=2345ccbc04e3de8b99dc6527a2203fe8
diff --git a/metadata/md5-cache/x11-proto/xextproto-7.3.0 b/metadata/md5-cache/x11-proto/xextproto-7.3.0
index 569d56e3e980..c42b8f74852c 100644
--- a/metadata/md5-cache/x11-proto/xextproto-7.3.0
+++ b/metadata/md5-cache/x11-proto/xextproto-7.3.0
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXext-1.0.99 abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.3.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=5c897237957fe6a132e85a1b7132cea7
diff --git a/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0-r1 b/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0-r1
index aa5cc5976797..ae6d047552de 100644
--- a/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0-r1
+++ b/metadata/md5-cache/x11-proto/xf86bigfontproto-1.2.0-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86bigfontproto-1.2.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=af8dc7a13025cc81744e356dae5faad1
diff --git a/metadata/md5-cache/x11-proto/xf86dgaproto-2.1-r2 b/metadata/md5-cache/x11-proto/xf86dgaproto-2.1-r2
index a295462728f6..409da7b490bf 100644
--- a/metadata/md5-cache/x11-proto/xf86dgaproto-2.1-r2
+++ b/metadata/md5-cache/x11-proto/xf86dgaproto-2.1-r2
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXxf86dga-1.0.99.1 abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86dgaproto-2.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=8a0ce5903a59d55d55a953d46e40127f
diff --git a/metadata/md5-cache/x11-proto/xf86driproto-2.1.1-r1 b/metadata/md5-cache/x11-proto/xf86driproto-2.1.1-r1
index 523cbb2c4804..d793631d5b69 100644
--- a/metadata/md5-cache/x11-proto/xf86driproto-2.1.1-r1
+++ b/metadata/md5-cache/x11-proto/xf86driproto-2.1.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86driproto-2.1.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=52dc737d121db59806768a196f40a91d
diff --git a/metadata/md5-cache/x11-proto/xf86vidmodeproto-2.3.1-r1 b/metadata/md5-cache/x11-proto/xf86vidmodeproto-2.3.1-r1
index 1f4aa637e3d1..4db75ba0bc35 100644
--- a/metadata/md5-cache/x11-proto/xf86vidmodeproto-2.3.1-r1
+++ b/metadata/md5-cache/x11-proto/xf86vidmodeproto-2.3.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXxf86vm-1.0.99.1 abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xf86vidmodeproto-2.3.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=1b0891897bb2020b84bc4775f074fece
diff --git a/metadata/md5-cache/x11-proto/xineramaproto-1.2.1-r1 b/metadata/md5-cache/x11-proto/xineramaproto-1.2.1-r1
index 0ac03685a75a..4f22de5c5ba2 100644
--- a/metadata/md5-cache/x11-proto/xineramaproto-1.2.1-r1
+++ b/metadata/md5-cache/x11-proto/xineramaproto-1.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=!<x11-libs/libXinerama-1.0.99.1 abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xineramaproto-1.2.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=93438854bcb656852e1e595006ab884d
diff --git a/metadata/md5-cache/x11-proto/xproto-7.0.25 b/metadata/md5-cache/x11-proto/xproto-7.0.25
index 14f747a8fb0a..2037c9c8983e 100644
--- a/metadata/md5-cache/x11-proto/xproto-7.0.25
+++ b/metadata/md5-cache/x11-proto/xproto-7.0.25
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.25.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=c330915cc9e3c7adff3b3892c2c6b774
diff --git a/metadata/md5-cache/x11-proto/xproto-7.0.26 b/metadata/md5-cache/x11-proto/xproto-7.0.26
index a4ec977c6f4b..82626329e27c 100644
--- a/metadata/md5-cache/x11-proto/xproto-7.0.26
+++ b/metadata/md5-cache/x11-proto/xproto-7.0.26
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.26.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=05106c9150dfe0aaaefb09d879b63e9d
diff --git a/metadata/md5-cache/x11-proto/xproto-7.0.27 b/metadata/md5-cache/x11-proto/xproto-7.0.27
index 6d49c146e9b2..ad9dc7a78e7d 100644
--- a/metadata/md5-cache/x11-proto/xproto-7.0.27
+++ b/metadata/md5-cache/x11-proto/xproto-7.0.27
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.27.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xorg-2	50dd640df6d0554c259daa81531ed3ee
 _md5_=15274dc0c48fdd4fcdf9e822b554d112
diff --git a/metadata/md5-cache/x11-terms/mlterm-3.4.3 b/metadata/md5-cache/x11-terms/mlterm-3.4.3
deleted file mode 100644
index d15130b37dc1..000000000000
--- a/metadata/md5-cache/x11-terms/mlterm-3.4.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo ) fcitx? ( app-i18n/fcitx ) gtk? ( x11-libs/gtk+ ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) xft? ( x11-libs/libXft ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=A multi-lingual terminal emulator
-EAPI=5
-HOMEPAGE=http://mlterm.sourceforge.net/
-IUSE=bidi cairo debug fcitx gtk ibus libssh2 m17n-lib nls regis scim static-libs uim utempter xft
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo ) fcitx? ( app-i18n/fcitx ) gtk? ( x11-libs/gtk+ ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) xft? ( x11-libs/libXft )
-SLOT=0
-SRC_URI=mirror://sourceforge/mlterm/mlterm-3.4.3.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=b315e7bbbb7af562880c9f17bc304aa6
diff --git a/metadata/md5-cache/x11-terms/mlterm-3.5.0 b/metadata/md5-cache/x11-terms/mlterm-3.5.0
new file mode 100644
index 000000000000..006644c48397
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/mlterm-3.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo ) canna? ( app-i18n/canna ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) gtk? ( >=x11-libs/gtk+-2 ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) xft? ( x11-libs/libXft ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=A multi-lingual terminal emulator
+EAPI=5
+HOMEPAGE=http://mlterm.sourceforge.net/
+IUSE=bidi cairo canna debug fcitx freewnn gtk ibus libssh2 m17n-lib nls regis scim static-libs uim utempter xft
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo ) canna? ( app-i18n/canna ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) gtk? ( >=x11-libs/gtk+-2 ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) xft? ( x11-libs/libXft )
+SLOT=0
+SRC_URI=mirror://sourceforge/mlterm/mlterm-3.5.0.tar.gz
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=a82257a22ce25451d248c6142a5f35c1
diff --git a/metadata/md5-cache/x11-themes/gnome-themes-standard-3.14.2.3-r2 b/metadata/md5-cache/x11-themes/gnome-themes-standard-3.14.2.3-r2
index 29490126af6b..a69a890d4c3e 100644
--- a/metadata/md5-cache/x11-themes/gnome-themes-standard-3.14.2.3-r2
+++ b/metadata/md5-cache/x11-themes/gnome-themes-standard-3.14.2.3-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=gnome-base/librsvg:2[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(-)?] x11-libs/cairo[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(-)?] gtk? ( >=x11-libs/gtk+-2.24.15:2[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(-)?] >=x11-libs/gtk+-3.12:3[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(-)?] ) >=gnome-base/gsettings-desktop-schemas-3.4 !<x11-themes/gnome-themes-2.32.1-r1
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-themes-standard/3.14/gnome-themes-standard-3.14.2.3.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=a9f12fbed17f7daad4c69664fc3f09c2
diff --git a/metadata/md5-cache/x11-themes/gnome-themes-standard-3.16.2 b/metadata/md5-cache/x11-themes/gnome-themes-standard-3.16.2
index 591838091d65..65280ffebda7 100644
--- a/metadata/md5-cache/x11-themes/gnome-themes-standard-3.16.2
+++ b/metadata/md5-cache/x11-themes/gnome-themes-standard-3.16.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=gnome-base/librsvg:2[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(-)?] x11-libs/cairo[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(-)?] gtk? ( >=x11-libs/gtk+-2.24.15:2[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(-)?] >=x11-libs/gtk+-3.12:3[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(-)?] ) >=gnome-base/gsettings-desktop-schemas-3.4 !<x11-themes/gnome-themes-2.32.1-r1
 SLOT=0
 SRC_URI=mirror://gnome/sources/gnome-themes-standard/3.16/gnome-themes-standard-3.16.2.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=060930e4ec222a3f81b3576680d7efe3
diff --git a/metadata/md5-cache/x11-themes/greybird-1.5.3 b/metadata/md5-cache/x11-themes/greybird-1.5.3
index 2b3821f8517c..6bac61736e19 100644
--- a/metadata/md5-cache/x11-themes/greybird-1.5.3
+++ b/metadata/md5-cache/x11-themes/greybird-1.5.3
@@ -3,10 +3,10 @@ DESCRIPTION=The default theme from Xubuntu
 EAPI=5
 HOMEPAGE=http://shimmerproject.org/project/greybird/ http://github.com/shimmerproject/Greybird
 IUSE=ayatana gnome
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
 LICENSE=CC-BY-SA-3.0 GPL-2+
 RDEPEND=>=x11-themes/gtk-engines-murrine-0.90
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/shimmerproject/Greybird/archive/v1.5.3.tar.gz -> greybird-1.5.3.tar.gz
-_md5_=d8bb5cbfa26603fd4ba89c68a9273b65
+_md5_=f2e0b567e64fa28daa6cda3eb62451da
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-2.20.2-r1 b/metadata/md5-cache/x11-themes/gtk-engines-2.20.2-r1
index f8d82c64642d..c1326bd1f922 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-2.20.2-r1
+++ b/metadata/md5-cache/x11-themes/gtk-engines-2.20.2-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=x11-libs/gtk+-2.24.23:2[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(-)?] lua? ( dev-lang/lua[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-gtklibs-20140508 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=2
 SRC_URI=mirror://gnome/sources/gtk-engines/2.20/gtk-engines-2.20.2.tar.bz2
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=121d26569eb1ede879d738c752d45480
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-murrine-0.98.2-r1 b/metadata/md5-cache/x11-themes/gtk-engines-murrine-0.98.2-r1
index 5119afb3ce5a..09d33a8672de 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-murrine-0.98.2-r1
+++ b/metadata/md5-cache/x11-themes/gtk-engines-murrine-0.98.2-r1
@@ -10,5 +10,5 @@ PDEPEND=themes? ( x11-themes/murrine-themes )
 RDEPEND=>=x11-libs/gtk+-2.24.23:2[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(-)?] >=dev-libs/glib-2.34.3:2[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(-)?] >=x11-libs/gdk-pixbuf-2.30.7:2[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(-)?] >=x11-libs/cairo-1.12.14-r4[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(-)?] >=x11-libs/pango-1.36.3[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(-)?] >=x11-libs/pixman-0.32.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-gtklibs-20140508 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/murrine/0.98/murrine-0.98.2.tar.xz
-_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	gnome.org	8fef8f967214f56e08fa92d61163d891	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
 _md5_=aa219d81fed51bac6554191f0c20b183
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-unico-1.0.3_pre20140109 b/metadata/md5-cache/x11-themes/gtk-engines-unico-1.0.3_pre20140109
index 1547610e7c84..c9682885bfa7 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-unico-1.0.3_pre20140109
+++ b/metadata/md5-cache/x11-themes/gtk-engines-unico-1.0.3_pre20140109
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.26:2[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(-)?] >=x11-libs/cairo-1.10[glib,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(-)?] >=x11-libs/gtk+-3.5.2:3[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
 SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/unico_1.0.3+14.04.20140109.orig.tar.gz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	autotools-multilib	037c4046d25f29e78dd44dccabd5d66b	autotools-utils	dbce0f7913bd240fdf0ef428149855c0	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4
 _md5_=7f8b2161b24c63634c9e3b4b96357026
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.1-r201 b/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.1-r201
index 1daf776adb8f..061fbe328b17 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.1-r201
+++ b/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.1-r201
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.34.3[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(-)?] >=x11-libs/gtk+-2.24.23:2[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-gtklibs-20140508 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/gtk-xfce-engine/3.0/gtk-xfce-engine-3.0.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xfconf	eee85b2bc9e9826f5a9c1349a75a69fe
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xfconf	eee85b2bc9e9826f5a9c1349a75a69fe
 _md5_=912f8ac3da227bb90c11f8374c37973f
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.1-r301 b/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.1-r301
index a69f41910ff6..981d95aa7936 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.1-r301
+++ b/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.0.1-r301
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.24[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(-)?] >=x11-libs/gtk+-3.2:3[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-gtklibs-20140508-r5 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=3
 SRC_URI=mirror://xfce/src/xfce/gtk-xfce-engine/3.0/gtk-xfce-engine-3.0.1.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xfconf	eee85b2bc9e9826f5a9c1349a75a69fe
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xfconf	eee85b2bc9e9826f5a9c1349a75a69fe
 _md5_=756dbbfe5c0a4e17383384f48bfea143
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.2.0-r200 b/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.2.0-r200
index de29b69bdc3e..abba4e930ac9 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.2.0-r200
+++ b/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.2.0-r200
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.34.3[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(-)?] >=x11-libs/gtk+-2.24.23:2[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-gtklibs-20140508 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=mirror://xfce/src/xfce/gtk-xfce-engine/3.2/gtk-xfce-engine-3.2.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xfconf	eee85b2bc9e9826f5a9c1349a75a69fe
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xfconf	eee85b2bc9e9826f5a9c1349a75a69fe
 _md5_=1492e2c62be3b6a96ac58f9466f7e157
diff --git a/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.2.0-r300 b/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.2.0-r300
index 7250d44a17d2..b15051b90c6b 100644
--- a/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.2.0-r300
+++ b/metadata/md5-cache/x11-themes/gtk-engines-xfce-3.2.0-r300
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.24[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(-)?] >=x11-libs/gtk+-3.2:3[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-gtklibs-20140508-r5 !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] )
 SLOT=3
 SRC_URI=mirror://xfce/src/xfce/gtk-xfce-engine/3.2/gtk-xfce-engine-3.2.0.tar.bz2
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xfconf	eee85b2bc9e9826f5a9c1349a75a69fe
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multilib-build	e733e978b7fa70607cc221fd9c070db6	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	42408102d713fbad60ca21349865edb4	xfconf	eee85b2bc9e9826f5a9c1349a75a69fe
 _md5_=97dc91f35f15023019af29ff198363e8
diff --git a/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r2 b/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r2
index f41033daf63d..a1354fbc7f86 100644
--- a/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r2
+++ b/metadata/md5-cache/x11-wm/fluxbox-1.3.7-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Fluxbox is an X11 window manager featuring tabs and an iconbar
 EAPI=5
 HOMEPAGE=http://www.fluxbox.org
 IUSE=nls xinerama bidi +truetype +imlib +slit +systray +toolbar vim-syntax
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=!!<=x11-misc/fbdesk-1.2.1 !!<=x11-misc/fluxconf-0.9.9 !!<x11-themes/fluxbox-styles-fluxmod-20040809-r1 bidi? ( >=dev-libs/fribidi-0.19.2 ) imlib? ( >=media-libs/imlib2-1.2.0[X] ) truetype? ( media-libs/freetype ) vim-syntax? ( app-vim/fluxbox-syntax ) x11-libs/libXext x11-libs/libXft x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) || ( x11-misc/gxmessage x11-apps/xmessage )
 REQUIRED_USE=systray? ( toolbar )
 SLOT=0
 SRC_URI=mirror://sourceforge/fluxbox/fluxbox-1.3.7.tar.xz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	flag-o-matic	c9602887773166fe300444712fc7ff98	multilib	62927b3db3a589b0806255f3a002d5d3	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=8d22a9608591c745e604b9c3de5da4d2
+_md5_=2afd5a4eb7e2a42247cf468594833a2d
diff --git a/metadata/md5-cache/x11-wm/mutter-3.14.3 b/metadata/md5-cache/x11-wm/mutter-3.14.3
deleted file mode 100644
index d8ff354ae462..000000000000
--- a/metadata/md5-cache/x11-wm/mutter-3.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.9.11:3[X,introspection?] >=dev-libs/glib-2.36.0:2 >=media-libs/clutter-1.19.5:1.0[introspection?] >=media-libs/cogl-1.17.1:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.7.3[introspection?] gnome-base/gnome-desktop:3= >sys-power/upower-0.99:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.2 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.7.4 x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-1.42 ) kms? ( dev-libs/libinput >=media-libs/clutter-1.20[egl] media-libs/cogl:1.0=[kms] >=media-libs/mesa-10.3[gbm] sys-apps/systemd virtual/libgudev x11-libs/libdrm:= ) wayland? ( >=dev-libs/wayland-1.5.90 >=media-libs/clutter-1.20[wayland] x11-base/xorg-server[wayland] ) >=dev-util/gtk-doc-am-1.15 >=dev-util/intltool-0.41 sys-devel/gettext virtual/pkgconfig x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto test? ( app-text/docbook-xml-dtd:4.5 ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4
-DESCRIPTION=GNOME 3 compositing window manager based on Clutter
-EAPI=5
-HOMEPAGE=http://git.gnome.org/browse/mutter/
-IUSE=+introspection +kms test wayland debug
-KEYWORDS=~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.9.11:3[X,introspection?] >=dev-libs/glib-2.36.0:2 >=media-libs/clutter-1.19.5:1.0[introspection?] >=media-libs/cogl-1.17.1:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.7.3[introspection?] gnome-base/gnome-desktop:3= >sys-power/upower-0.99:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.2 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.7.4 x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-1.42 ) kms? ( dev-libs/libinput >=media-libs/clutter-1.20[egl] media-libs/cogl:1.0=[kms] >=media-libs/mesa-10.3[gbm] sys-apps/systemd virtual/libgudev x11-libs/libdrm:= ) wayland? ( >=dev-libs/wayland-1.5.90 >=media-libs/clutter-1.20[wayland] x11-base/xorg-server[wayland] ) !x11-misc/expocity
-SLOT=0
-SRC_URI=mirror://gnome/sources/mutter/3.14/mutter-3.14.3.tar.xz
-_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=97d60144f9d5b51fae13b4388fd370a3
diff --git a/metadata/md5-cache/x11-wm/mutter-3.16.2-r1 b/metadata/md5-cache/x11-wm/mutter-3.16.2-r1
new file mode 100644
index 000000000000..e9e9cf528c9c
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/mutter-3.16.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.9.11:3[X,introspection?] >=dev-libs/glib-2.36.0:2[dbus] >=media-libs/clutter-1.21.3:1.0[introspection?] >=media-libs/cogl-1.17.1:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.15.92[introspection?] gnome-base/gnome-desktop:3= >sys-power/upower-0.99:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.2 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.7.4 x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-1.42:= ) kms? ( dev-libs/libinput >=media-libs/clutter-1.20[egl] media-libs/cogl:1.0=[kms] >=media-libs/mesa-10.3[gbm] sys-apps/systemd virtual/libgudev x11-libs/libdrm:= ) wayland? ( >=dev-libs/wayland-1.5.90 >=media-libs/clutter-1.20[wayland] x11-base/xorg-server[wayland] ) >=dev-util/gtk-doc-am-1.15 >=dev-util/intltool-0.41 sys-devel/gettext virtual/pkgconfig x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto test? ( app-text/docbook-xml-dtd:4.5 ) app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=GNOME 3 compositing window manager based on Clutter
+EAPI=5
+HOMEPAGE=http://git.gnome.org/browse/mutter/
+IUSE=+introspection +kms test wayland debug
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+
+RDEPEND=>=x11-libs/pango-1.2[X,introspection?] >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-3.9.11:3[X,introspection?] >=dev-libs/glib-2.36.0:2[dbus] >=media-libs/clutter-1.21.3:1.0[introspection?] >=media-libs/cogl-1.17.1:1.0=[introspection?] >=media-libs/libcanberra-0.26[gtk3] >=x11-libs/startup-notification-0.7 >=x11-libs/libXcomposite-0.2 >=gnome-base/gsettings-desktop-schemas-3.15.92[introspection?] gnome-base/gnome-desktop:3= >sys-power/upower-0.99:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.2 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes >=x11-libs/libXi-1.7.4 x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libxcb x11-libs/libxkbfile >=x11-libs/libxkbcommon-0.4.3[X] x11-misc/xkeyboard-config gnome-extra/zenity introspection? ( >=dev-libs/gobject-introspection-1.42:= ) kms? ( dev-libs/libinput >=media-libs/clutter-1.20[egl] media-libs/cogl:1.0=[kms] >=media-libs/mesa-10.3[gbm] sys-apps/systemd virtual/libgudev x11-libs/libdrm:= ) wayland? ( >=dev-libs/wayland-1.5.90 >=media-libs/clutter-1.20[wayland] x11-base/xorg-server[wayland] ) !x11-misc/expocity
+SLOT=0
+SRC_URI=mirror://gnome/sources/mutter/3.16/mutter-3.16.2.tar.xz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	10c513def52488230abb60a4b19a03b9	gnome2-utils	5cdfd22a2163c9d3a891648bd19453a7	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=ef5f1a780c203071828abc4b1549d452
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 5a3ff65d1b5d..66ad1357a38e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 26 Jun 2015 09:37:09 +0000
+Sun, 28 Jun 2015 12:06:57 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 2e669cf6d294..8e9799919290 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Jun 26 09:37:06 UTC 2015
+Sun Jun 28 12:06:54 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 8c6dd6203957..778a7e55a3c3 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 26 Jun 2015 10:00:01 +0000
+Sun, 28 Jun 2015 12:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 7d68424b362e..da99e80af93b 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1435311301 Fri 26 Jun 2015 09:35:01 AM UTC
+1435493101 Sun 28 Jun 2015 12:05:01 PM UTC
diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest
index 6befecc4fa78..05bbc69fa0d3 100644
--- a/net-analyzer/linkchecker/Manifest
+++ b/net-analyzer/linkchecker/Manifest
@@ -1,2 +1 @@
-DIST LinkChecker-9.2.tar.gz 715452 SHA256 ba556cd1c172c2cbcb92fc3405d48f44fa56c3074ed3b7ead87f635ad54fb907 SHA512 41f500966abeec036ef692fd77bab5c487665de70728dddf909feea6f636e6bf62624b9200115dcb7ea8e7c3e06716953f2e855aa74992f8dde5c2d4dc553426 WHIRLPOOL 12a444475b6d478c9583e9ab42fc7cf812556c773ecb332664d65606ecb764bde2d60da06fd8e15e4c85b65ec4d3e31bb98c6c5b45babfb36429ce5c8a61ed9e
 DIST LinkChecker-9.3.tar.gz 719896 SHA256 ee0aa60de440fdcf8587ddebf1f691bc777a32d8d4f119beed63f405dc56176d SHA512 26686e5373aaa942b631b5184f8bda8fbe1410c8875bf8499a2b61dc18b7bdfa29a3c18edf98c28dc189a493a3f5794a0020a0211b7d5d3814b33994603dcc59 WHIRLPOOL 6b0b41d3edacafba6ae5df5b0f4ccf1fb5877c938acdd2d66c443bf10c43fcc9213f08cfff212a1a259d9f767138cd04fc1c481db1594d426784b0ce5702ee5f
diff --git a/net-analyzer/linkchecker/linkchecker-9.2.ebuild b/net-analyzer/linkchecker/linkchecker-9.2.ebuild
deleted file mode 100644
index 2d00c7dbb3f5..000000000000
--- a/net-analyzer/linkchecker/linkchecker-9.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/linkchecker/linkchecker-9.2.ebuild,v 1.4 2015/04/19 07:02:47 pacho Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite?"
-
-inherit bash-completion-r1 distutils-r1 eutils multilib
-
-MY_PN="${PN/linkchecker/LinkChecker}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Check websites for broken links"
-HOMEPAGE="http://wummel.github.com/linkchecker/ http://pypi.python.org/pypi/linkchecker/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~ppc-macos ~x64-solaris"
-IUSE="bash-completion clamav geoip gnome login sqlite X"
-
-RDEPEND="
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
-	bash-completion? ( dev-python/argcomplete[${PYTHON_USEDEP}] )
-	clamav? ( app-antivirus/clamav )
-	geoip? ( dev-python/geoip-python[${PYTHON_USEDEP}] )
-	gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	login? ( dev-python/twill[${PYTHON_USEDEP}] )
-	X? (
-		dev-python/PyQt4[X,help,${PYTHON_USEDEP}]
-		dev-python/qscintilla-python[${PYTHON_USEDEP}]
-		)"
-DEPEND="
-	X? (
-		dev-qt/qthelp:4
-		dev-python/markdown2[${PYTHON_USEDEP}]
-		)"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}-unbundle.patch
-		)
-
-	emake -C doc/html
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	DOCS=(
-		doc/upgrading.txt
-		doc/python3.txt
-		doc/changelog.txt
-		doc/development.txt
-	)
-	distutils-r1_python_install_all
-	if ! use X; then
-		delete_gui() {
-				rm -rf \
-					"${ED}"/usr/bin/linkchecker-gui* \
-					"${ED}"/$(python_get_sitedir)/linkcheck/gui* || die
-		}
-		python_foreach_impl delete_gui
-	fi
-	dohtml doc/html/*
-	use bash-completion && dobashcomp config/linkchecker-completion
-}
diff --git a/net-analyzer/linkchecker/metadata.xml b/net-analyzer/linkchecker/metadata.xml
index 42ea6f8219db..9d0f406a3831 100644
--- a/net-analyzer/linkchecker/metadata.xml
+++ b/net-analyzer/linkchecker/metadata.xml
@@ -6,7 +6,6 @@
   </maintainer>
   <use>
     <flag name="sqlite">Mozilla Bookmark parsing</flag>
-    <flag name="login">login form submission</flag>
   </use>
   <upstream>
     <remote-id type="pypi">LinkChecker</remote-id>
diff --git a/net-analyzer/pmacct/pmacct-1.5.1.ebuild b/net-analyzer/pmacct/pmacct-1.5.1.ebuild
index e15c0e6c25c1..010fafaca1e0 100644
--- a/net-analyzer/pmacct/pmacct-1.5.1.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.5.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/pmacct/pmacct-1.5.1.ebuild,v 1.4 2015/05/27 11:21:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/pmacct/pmacct-1.5.1.ebuild,v 1.5 2015/06/27 06:38:39 jer Exp $
 
 EAPI=5
 inherit toolchain-funcs
@@ -51,6 +51,8 @@ src_configure() {
 		$(use_enable sqlite sqlite3) \
 		$(use_enable threads) \
 		$(use_enable ulog) \
+		$(usex mysql "--with-mysql-includes=$(mysql_config --variable=pkgincludedir)" '') \
+		$(usex mysql "--with-mysql-libs=$(mysql_config --variable=pkglibdir)" '') \
 		--disable-debug
 }
 
diff --git a/net-analyzer/sarg/sarg-2.3.10.ebuild b/net-analyzer/sarg/sarg-2.3.10.ebuild
index 74adfff2420b..cc0754c4daef 100644
--- a/net-analyzer/sarg/sarg-2.3.10.ebuild
+++ b/net-analyzer/sarg/sarg-2.3.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/net-analyzer/sarg/sarg-2.3.10.ebuild,v 1.1 2015/02/17 10:21:38 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.3.10.ebuild,v 1.2 2015/06/26 12:15:28 ago Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -10,7 +10,7 @@ HOMEPAGE="http://sarg.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 SLOT="0"
 IUSE="+gd ldap pcre"
 
diff --git a/net-analyzer/tcpdump/tcpdump-4.7.4.ebuild b/net-analyzer/tcpdump/tcpdump-4.7.4.ebuild
index 1d36d4816885..781bee8dc2cc 100644
--- a/net-analyzer/tcpdump/tcpdump-4.7.4.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-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/net-analyzer/tcpdump/tcpdump-4.7.4.ebuild,v 1.6 2015/06/25 05:05:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-4.7.4.ebuild,v 1.7 2015/06/28 10:49:46 maekke Exp $
 
 EAPI=5
 inherit flag-o-matic toolchain-funcs user
@@ -12,7 +12,7 @@ SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="+drop-root smi ssl ipv6 samba suid test"
 
 RDEPEND="
diff --git a/net-dns/libidn/libidn-1.30.ebuild b/net-dns/libidn/libidn-1.30.ebuild
index a38556da5d40..515ece1eca39 100644
--- a/net-dns/libidn/libidn-1.30.ebuild
+++ b/net-dns/libidn/libidn-1.30.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-dns/libidn/libidn-1.30.ebuild,v 1.2 2015/06/25 05:34:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.30.ebuild,v 1.4 2015/06/27 12:42:48 maekke Exp $
 
 EAPI=5
 inherit elisp-common java-pkg-opt-2 mono-env multilib-minimal
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
 
 LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs java mono nls static-libs"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
diff --git a/net-firewall/firewalld/firewalld-0.3.13.ebuild b/net-firewall/firewalld/firewalld-0.3.13.ebuild
index c66d03dfe1dc..033b0375198d 100644
--- a/net-firewall/firewalld/firewalld-0.3.13.ebuild
+++ b/net-firewall/firewalld/firewalld-0.3.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-firewall/firewalld/firewalld-0.3.13.ebuild,v 1.1 2015/05/25 20:58:45 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/firewalld/firewalld-0.3.13.ebuild,v 1.2 2015/06/26 12:15:08 ago Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -15,7 +15,7 @@ SRC_URI="https://fedorahosted.org/released/firewalld/${P}.tar.bz2
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="gui"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/net-fs/libnfs/libnfs-1.9.7.ebuild b/net-fs/libnfs/libnfs-1.9.7.ebuild
index 85852bff54d2..385111cd845b 100644
--- a/net-fs/libnfs/libnfs-1.9.7.ebuild
+++ b/net-fs/libnfs/libnfs-1.9.7.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-fs/libnfs/libnfs-1.9.7.ebuild,v 1.5 2015/06/26 09:06:28 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/libnfs/libnfs-1.9.7.ebuild,v 1.6 2015/06/27 12:39:49 maekke Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2 autotools-utils
 else
 	SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm hppa ~ppc ppc64 x86"
+	KEYWORDS="amd64 arm hppa ~ppc ppc64 x86"
 	inherit autotools-utils
 fi
 
diff --git a/net-fs/openafs-legacy/openafs-legacy-0.1.ebuild b/net-fs/openafs-legacy/openafs-legacy-0.1.ebuild
index fc22c295fceb..806ab33ecff4 100644
--- a/net-fs/openafs-legacy/openafs-legacy-0.1.ebuild
+++ b/net-fs/openafs-legacy/openafs-legacy-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/net-fs/openafs-legacy/openafs-legacy-0.1.ebuild,v 1.7 2015/06/19 07:34:59 np-hardass Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-legacy/openafs-legacy-0.1.ebuild,v 1.8 2015/06/26 22:29:00 np-hardass Exp $
 
 EAPI=5
 
@@ -16,6 +16,8 @@ DEPEND="sys-apps/baselayout"
 RDEPEND="${DEPEND}"
 PDEPEND="net-fs/openafs"
 
+S="${WORKDIR}"
+
 # As a guide for these links, acinclude.m4 from the openafs package was
 # used.  A README file exists as well, but at the time of writing, the
 # afsbosserver-variable was inaccurately described.
diff --git a/net-fs/samba/samba-4.0.26.ebuild b/net-fs/samba/samba-4.0.26.ebuild
index f1b8ee63bfb3..f076e5ff13dc 100644
--- a/net-fs/samba/samba-4.0.26.ebuild
+++ b/net-fs/samba/samba-4.0.26.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.26.ebuild,v 1.2 2015/06/03 17:03:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.0.26.ebuild,v 1.3 2015/06/28 03:34:52 patrick Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
 
-inherit python-single-r1 waf-utils multilib linux-info systemd
+inherit python-single-r1 waf-utils multilib linux-info systemd eutils
 
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
diff --git a/net-fs/samba/samba-4.1.18.ebuild b/net-fs/samba/samba-4.1.18.ebuild
index 6bd6d0914bd1..b7f6465dc15b 100644
--- a/net-fs/samba/samba-4.1.18.ebuild
+++ b/net-fs/samba/samba-4.1.18.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.18.ebuild,v 1.3 2015/06/03 17:03:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.18.ebuild,v 1.4 2015/06/28 03:34:52 patrick Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
 
-inherit python-single-r1 waf-utils multilib linux-info systemd
+inherit python-single-r1 waf-utils multilib linux-info systemd base
 
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
@@ -26,7 +26,7 @@ ldap quota selinux syslog systemd test winbind"
 # sys-apps/attr is an automagic dependency (see bug #489748)
 # sys-libs/pam is an automagic dependency (see bug #489770)
 CDEPEND="${PYTHON_DEPS}
-	>=app-crypt/heimdal-1.5[-ssl]
+	>=app-crypt/heimdal-1.5[-ssl,-threads]
 	dev-libs/iniparser
 	dev-libs/popt
 	sys-libs/readline:=
diff --git a/net-fs/samba/samba-4.1.19.ebuild b/net-fs/samba/samba-4.1.19.ebuild
index a4efdbb24f21..7533aa85bffb 100644
--- a/net-fs/samba/samba-4.1.19.ebuild
+++ b/net-fs/samba/samba-4.1.19.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.19.ebuild,v 1.1 2015/06/26 07:37:20 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.1.19.ebuild,v 1.2 2015/06/28 03:34:52 patrick Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
 
-inherit python-single-r1 waf-utils multilib linux-info systemd
+inherit python-single-r1 waf-utils multilib linux-info systemd base
 
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
@@ -26,7 +26,7 @@ ldap quota selinux syslog systemd test winbind"
 # sys-apps/attr is an automagic dependency (see bug #489748)
 # sys-libs/pam is an automagic dependency (see bug #489770)
 CDEPEND="${PYTHON_DEPS}
-	>=app-crypt/heimdal-1.5[-ssl]
+	>=app-crypt/heimdal-1.5[-ssl,-threads]
 	dev-libs/iniparser
 	dev-libs/popt
 	sys-libs/readline:=
diff --git a/net-fs/samba/samba-4.2.0.ebuild b/net-fs/samba/samba-4.2.0.ebuild
index be6d23e2dfe7..9343253cef52 100644
--- a/net-fs/samba/samba-4.2.0.ebuild
+++ b/net-fs/samba/samba-4.2.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.2.0.ebuild,v 1.2 2015/06/03 17:03:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-4.2.0.ebuild,v 1.3 2015/06/28 03:34:52 patrick Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
 
-inherit python-single-r1 waf-utils multilib linux-info systemd
+inherit python-single-r1 waf-utils multilib linux-info systemd eutils
 
 MY_PV="${PV/_rc/rc}"
 MY_P="${PN}-${MY_PV}"
diff --git a/net-im/corebird/Manifest b/net-im/corebird/Manifest
index 9cb6b766a473..f4ffd33643b3 100644
--- a/net-im/corebird/Manifest
+++ b/net-im/corebird/Manifest
@@ -1 +1,2 @@
 DIST corebird-0.8.tar.gz 1655839 SHA256 4e68e174edc40b49d70a11c1b0a1b196ca9517daa8eae6ce2da3e8004acda611 SHA512 308bc0ade8ddda0b0be0949e5199bf6ac1b3658bf6e181821a205a602b2a22a97e77583cd5ca63ba272926810095104ae4117e54ccda10234d143c3377b9384d WHIRLPOOL 2e014590c0d9222a6a53d78d855ff9017fa9b3c68c2c354bc2acad1b028bd6253fa9510fbc5ce391bc65319829e14c5447b4be4cbcc8427faace790767e6d98c
+DIST corebird-1.0.tar.gz 1697452 SHA256 0ca4ca20b0281b2901382810ef8bd1682bb896c3915ad3bea3f2a41461118001 SHA512 098dd764a3aecaeda90ad5b0e24a4bf172025ce1a4105b713a1a73385d1de9cca028d7a34a39e9682ad4e2b2b22d4bf2889668c587e363cdfa6053136b1f4c39 WHIRLPOOL e033988b94632ad6b8d4e8c79a6125311466e81d746dd434801451f71e4590558b1797e8690ff033c1c04aeb4a299191993421a64e9d3a925409cda663478ab8
diff --git a/net-im/corebird/corebird-1.0.ebuild b/net-im/corebird/corebird-1.0.ebuild
new file mode 100644
index 000000000000..c594043db411
--- /dev/null
+++ b/net-im/corebird/corebird-1.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/corebird/corebird-1.0.ebuild,v 1.1 2015/06/26 18:23:03 pacho Exp $
+
+EAPI=5
+VALA_MIN_API_VERSION=0.24
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit eutils autotools-utils gnome2 vala
+
+DESCRIPTION="Native GTK+3 Twitter client"
+HOMEPAGE="http://corebird.baedert.org/"
+SRC_URI="https://github.com/baedert/corebird/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gstreamer"
+
+RDEPEND="
+	dev-db/sqlite:3
+	>=dev-libs/glib-2.40:2
+	dev-libs/json-glib
+	dev-libs/libgee:0.8
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[X,ffmpeg] )
+	>=net-libs/libsoup-2.42.3.1
+	>=net-libs/rest-0.7.91:0.7
+	>=x11-libs/gtk+-3.14:3
+"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	>=dev-util/intltool-0.40
+	sys-apps/sed
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	sed -i -e "/manpagedir/s/manpagedir.*/&\/man1/g" data/Makefile.am || die
+	autotools-utils_src_prepare
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(usex gstreamer "" --disable-video)
+	)
+	gnome2_src_configure "${myeconfargs[@]}"
+}
diff --git a/net-im/pidgin/pidgin-2.10.11.ebuild b/net-im/pidgin/pidgin-2.10.11.ebuild
index 67399a8e8191..dc60cde94175 100644
--- a/net-im/pidgin/pidgin-2.10.11.ebuild
+++ b/net-im/pidgin/pidgin-2.10.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/net-im/pidgin/pidgin-2.10.11.ebuild,v 1.7 2015/05/22 04:47:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.10.11.ebuild,v 1.8 2015/06/27 12:33:37 maekke Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile mxit"
 IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
 IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
diff --git a/net-libs/libgadu/libgadu-1.12.1.ebuild b/net-libs/libgadu/libgadu-1.12.1.ebuild
index 58658df680bc..38286133c7df 100644
--- a/net-libs/libgadu/libgadu-1.12.1.ebuild
+++ b/net-libs/libgadu/libgadu-1.12.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/libgadu/libgadu-1.12.1.ebuild,v 1.4 2015/05/17 20:17:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libgadu/libgadu-1.12.1.ebuild,v 1.5 2015/06/27 12:32:18 maekke Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://toxygen.net/libgadu/"
 SRC_URI="https://github.com/wojtekka/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
 IUSE="doc gnutls ssl static-libs test threads"
 
diff --git a/net-libs/libpcap/libpcap-1.7.3.ebuild b/net-libs/libpcap/libpcap-1.7.3.ebuild
index cfe5a5727248..39ec2a6b671a 100644
--- a/net-libs/libpcap/libpcap-1.7.3.ebuild
+++ b/net-libs/libpcap/libpcap-1.7.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/net-libs/libpcap/libpcap-1.7.3.ebuild,v 1.6 2015/06/26 08:04:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libpcap/libpcap-1.7.3.ebuild,v 1.7 2015/06/28 10:48:58 maekke Exp $
 
 EAPI=5
 inherit autotools eutils multilib-minimal
@@ -12,7 +12,7 @@ SRC_URI="http://www.tcpdump.org/release/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="bluetooth dbus ipv6 netlink static-libs canusb"
 
 RDEPEND="
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild
index cab58c7999d2..0b466c03b084 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.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/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild,v 1.4 2014/12/28 16:31:47 titanofold Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.4.17-r1.ebuild,v 1.5 2015/06/26 17:33:50 grknight Exp $
 
 EAPI=4
 
@@ -17,12 +17,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="afs berkdb kerberos mysql nntp pam postgres replication sieve snmp sqlite ssl tcpd"
 
+# virtual/mysql-5.5 added for the --variable= option below
 RDEPEND="sys-libs/zlib
 	>=dev-libs/cyrus-sasl-2.1.13
 	afs? ( net-fs/openafs )
 	berkdb? ( >=sys-libs/db-3.2 )
 	kerberos? ( virtual/krb5 )
-	mysql? ( virtual/mysql )
+	mysql? ( >=virtual/mysql-5.5 )
 	nntp? ( !net-nntp/leafnode )
 	pam? (
 			virtual/pam
@@ -98,9 +99,8 @@ src_prepare() {
 src_configure() {
 	local myconf
 	if use mysql ; then
-		myconf=$(mysql_config --include)
-		myconf="--with-mysql-incdir=${myconf#-I}"
-		myconf+=" --with-mysql-libdir=/usr/$(get_libdir)/mysql"
+		myconf="--with-mysql-incdir=$(mysql_config --variable=pkgincludedir)"
+		myconf+=" --with-mysql-libdir=$(mysql_config --variable=pkglibdir)"
 	fi
 	if use afs ; then
 		myconf+=" --with-afs-libdir=/usr/$(get_libdir)"
diff --git a/net-misc/memcached/memcached-1.4.24.ebuild b/net-misc/memcached/memcached-1.4.24.ebuild
index 2dd8e1204661..a3d84491aff3 100644
--- a/net-misc/memcached/memcached-1.4.24.ebuild
+++ b/net-misc/memcached/memcached-1.4.24.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/memcached/memcached-1.4.24.ebuild,v 1.1 2015/05/15 18:03:51 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/memcached/memcached-1.4.24.ebuild,v 1.2 2015/06/26 12:14:06 ago Exp $
 
 EAPI=5
 inherit autotools eutils flag-o-matic systemd user
@@ -14,7 +14,7 @@ SRC_URI="http://www.memcached.org/files/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4
diff --git a/net-misc/minidlna/minidlna-1.1.4.ebuild b/net-misc/minidlna/minidlna-1.1.4.ebuild
index 3fedd2dcecbd..d4cc25780f33 100644
--- a/net-misc/minidlna/minidlna-1.1.4.ebuild
+++ b/net-misc/minidlna/minidlna-1.1.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-misc/minidlna/minidlna-1.1.4.ebuild,v 1.1 2015/02/27 11:50:34 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/minidlna/minidlna-1.1.4.ebuild,v 1.2 2015/06/27 09:49:11 ago Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="netgear readynas"
 
 RDEPEND="dev-db/sqlite:3
diff --git a/net-misc/mosh/mosh-9999.ebuild b/net-misc/mosh/mosh-9999.ebuild
index 09e52660ce49..21058878e25c 100644
--- a/net-misc/mosh/mosh-9999.ebuild
+++ b/net-misc/mosh/mosh-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/net-misc/mosh/mosh-9999.ebuild,v 1.16 2015/06/24 10:31:21 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-9999.ebuild,v 1.17 2015/06/26 10:32:25 mrueg Exp $
 
 EAPI=5
 
@@ -55,5 +55,5 @@ src_install() {
 	done
 
 	# bug 477384
-	dobashcomp conf/bash_completion.d/mosh
+	dobashcomp conf/bash-completion/completions/mosh
 }
diff --git a/net-misc/ofono/ofono-1.16.ebuild b/net-misc/ofono/ofono-1.16.ebuild
index 221a2bca4148..22979d3c18eb 100644
--- a/net-misc/ofono/ofono-1.16.ebuild
+++ b/net-misc/ofono/ofono-1.16.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/ofono/ofono-1.16.ebuild,v 1.4 2015/06/21 07:16:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ofono/ofono-1.16.ebuild,v 1.6 2015/06/27 12:42:00 maekke Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/network/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+atmodem bluetooth +cdmamodem +datafiles doc dundee examples +isimodem +phonesim +provision +qmimodem threads tools +udev"
 
 REQUIRED_USE="dundee? ( bluetooth )"
diff --git a/net-misc/owncloud-client/Manifest b/net-misc/owncloud-client/Manifest
index 8b7d8246175f..ce53a7416daf 100644
--- a/net-misc/owncloud-client/Manifest
+++ b/net-misc/owncloud-client/Manifest
@@ -2,3 +2,4 @@ DIST mirall-1.7.0.tar.bz2 12634961 SHA256 b1cb0612e5022de263dc4c6309eba8207d694a
 DIST mirall-1.7.1.tar.bz2 12668153 SHA256 ce1bc5784eb42d3f510c6d012d0ad86eefbab99f54f4e8653f546d2c4fda2f59 SHA512 fc9c690c0bf7c1e2577d472ee429e62a274c1e5ee92f6db8134c5539e11df64abcaeaf0cdd64b915247cd7ceb3b00522ef0dd0527e522f344719d12a86e98ea7 WHIRLPOOL 6ba577408910e688ac2924f3cc7579d551ae870ac2c377407fd5e96a3a86b19f571926a1a59583a53b7de04c01d5b712c530fb3886855806304b26020825e505
 DIST owncloudclient-1.8.0.tar.bz2 13556481 SHA256 192bec5fe4b60c40d3a5d60abe224a1029af653ce445515290f3f1bb7967b0bd SHA512 d25bd0ef28991c727c99bda6e5b6c44de70eca78c4dededb85784c56c63665ec613c469b1f16d1e6e84f552b5f9a3ae996bd6dffc456765d32bef0208a5875e6 WHIRLPOOL 559ee0046256282ca3f3218ad50b89924b62b9756dd51ebfa64e3fa71296c03045f6d2df8c644995af431091bfe41994ed74400936a1d80f88f28f3b3cc27b68
 DIST owncloudclient-1.8.1.tar.xz 11343868 SHA256 8b9bb4fea2a4b80938a3477813839ac325ac1ed39a85a8f1e0cd3ebb0e430ea3 SHA512 171e378f283ecf51439f9e897bd0111bc5f7bdfdf8b2ae4e6b016a566e3848724419187887a542772f0f5aa6d96ff287b7d3ee45b085bb34771a7db0597138da WHIRLPOOL 5f43592ec59b642dc5ba83511f7d2e9a1e57a3254cd6582618e0c93cd7e3fb539af9a7d5b5524581300528a0e2b8dbf2ec23072fcf13740d4e422907b54094d9
+DIST owncloudclient-1.8.3.tar.xz 11372576 SHA256 8cc4f8f6c146ff163f76d1b149ec92f3f98c07e3ea19c251d99d6a99affd0dde SHA512 e1dc54c99f04b4365af648f0d9a69249cdb7254728827bdf210dd336fc10571a431a9695f063f9abb306430059a6a63ed23ed588a035611725934ccdb1c57f90 WHIRLPOOL f7533d07913ce81a9a07f39eb892229646ccb8e4332159a80c08998c9f95901d57fcf01cca20ebbcb0a2f50e2009996a6659fd94e9e32da9d33cff7f97b3eb42
diff --git a/net-misc/owncloud-client/owncloud-client-1.8.3.ebuild b/net-misc/owncloud-client/owncloud-client-1.8.3.ebuild
new file mode 100644
index 000000000000..ae53cea61418
--- /dev/null
+++ b/net-misc/owncloud-client/owncloud-client-1.8.3.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/owncloud-client/owncloud-client-1.8.3.ebuild,v 1.2 2015/06/26 23:01:36 voyageur Exp $
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Synchronize files from ownCloud Server with your computer"
+HOMEPAGE="http://owncloud.org/"
+SRC_URI="http://download.owncloud.com/desktop/stable/${P/-}.tar.xz"
+
+LICENSE="CC-BY-3.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc nautilus samba +sftp test qt4 +qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+RDEPEND=">=dev-db/sqlite-3.4:3
+	sys-fs/inotify-tools
+	virtual/libiconv
+	nautilus? ( dev-python/nautilus-python )
+	qt4? (
+		dev-libs/qtkeychain[qt4]
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4
+		dev-qt/qtsql:4
+		dev-qt/qtwebkit:4
+		net-libs/neon[ssl]
+	)
+	qt5? (
+		dev-libs/qtkeychain[qt5]
+		dev-qt/linguist-tools:5
+		dev-qt/qtconcurrent:5
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		>=dev-qt/qtnetwork-5.4:5
+		dev-qt/qtgui:5
+		dev-qt/qtquickcontrols:5
+		dev-qt/qtsql:5
+		dev-qt/qtwebkit:5[printsupport]
+	)
+	samba? ( >=net-fs/samba-3.5 )
+	sftp? ( >=net-libs/libssh-0.5 )
+	!net-misc/ocsync"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/sphinx
+		dev-texlive/texlive-latexextra
+		virtual/latex-base
+	)
+	test? (
+		dev-util/cmocka
+		qt4? ( dev-qt/qttest:4 )
+		qt5? ( dev-qt/qttest:5 )
+	)"
+
+S=${WORKDIR}/${P/-}
+
+src_prepare() {
+	# Keep tests in ${T}
+	sed -i -e "s#\"/tmp#\"${T}#g" test/test*.h || die "sed failed"
+
+	use nautilus || sed -i -e "s/add_subdirectory(nautilus)//" \
+		shell_integration/CMakeLists.txt || die "sed failed"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DWITH_ICONV=ON
+		$(cmake-utils_use_with doc DOC)
+		$(cmake-utils_use test UNIT_TESTING)
+		$(cmake-utils_use_find_package samba Libsmbclient)
+		$(cmake-utils_use_find_package sftp LibSSH)
+		$(cmake-utils_use_build qt4 WITH_QT4)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	# 1 test needs an existing ${HOME}/.config directory
+	mkdir "${T}"/.config
+	export HOME="${T}"
+	cmake-utils_src_test
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Documentation and man pages not installed"
+		elog "Enable doc USE-flag to generate them"
+	fi
+}
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 3968e3dc2787..e624e28dfb0f 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -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/profiles/arch/amd64/no-multilib/package.mask,v 1.142 2015/06/02 09:15:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/package.mask,v 1.143 2015/06/27 18:03:08 tetromino Exp $
 
 # AMD64 Team <amd64@gentoo.org>
 # Mask packages that rely on amd64 multilib
@@ -18,7 +18,6 @@ app-emulation/vmware-player
 >=app-i18n/atokx3-3.0.0
 app-office/ooextras
 app-emulation/winetricks
-app-emulation/wine-doors
 app-text/acroread
 app-office/lotus-notes
 dev-embedded/libftd2xx
@@ -112,7 +111,6 @@ games-rpg/nwn-data
 games-rpg/nwn-penultima
 games-rpg/nwn-penultimarerolled
 games-rpg/nwn-shadowlordsdreamcatcherdemon
-games-rpg/rain-slick
 games-rpg/sacred-gold
 games-server/etqw-ded
 games-server/nwn-ded
diff --git a/profiles/arch/amd64/no-multilib/package.use.mask b/profiles/arch/amd64/no-multilib/package.use.mask
index 218a498acac2..c1702f4921bd 100644
--- a/profiles/arch/amd64/no-multilib/package.use.mask
+++ b/profiles/arch/amd64/no-multilib/package.use.mask
@@ -1,10 +1,10 @@
-# 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/profiles/arch/amd64/no-multilib/package.use.mask,v 1.16 2014/11/13 08:53:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/package.use.mask,v 1.17 2015/06/27 18:03:08 tetromino Exp $
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (24 Jun 2012)
 # Disable 32-bit parts of wine, bug #351436
-app-emulation/wine mono win32
+app-emulation/wine mono
 
 # Apr 28, 2008 Sébastien Fabbro <bicatali@gentoo.org>
 # ifc masked
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index e564ebecc292..3de84512bcbe 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -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/profiles/arch/amd64/package.use.mask,v 1.204 2015/06/09 22:21:20 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.205 2015/06/27 18:03:08 tetromino 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
@@ -331,7 +331,3 @@ media-sound/lame cpu_flags_x86_mmx
 # Robert Buchholz <rbu@gentoo.org> (16 Aug 2008)
 # masked in base, unmask for x86/amd64
 dev-python/kaa-base -tls
-
-# Samuli Suominen <ssuominen@gentoo.org> (13 Mar 2013)
-# Works with new wine, doesn't work with old wine wrt #461602
-<app-emulation/wine-1.5.25 gstreamer
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index c5aa4e9260eb..44413afc4ad6 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -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/profiles/base/package.use.mask,v 1.690 2015/06/21 15:28:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.691 2015/06/27 17:47:05 tetromino Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
@@ -292,10 +292,6 @@ dev-libs/boost context
 # and affected versions are removed from the tree.
 <media-sound/umurmur-0.2.14 polarssl
 
-# Gilles Dartiguelongue <eva@gentoo.org> (25 Dec 2013)
-# gjs: tests fail and support for it was purely and simply removed in master/1.9
->=dev-libs/libpeas-1.9 gjs
-
 # Gilles Dartiguelongue <eva@gentoo.org> (23 Dec 2013)
 # Gstreamer support fails to build due to libtool shortcomings when using
 # an intermediate library as a dependency of another libtool target dependency.
@@ -497,11 +493,6 @@ dev-ml/tyxml ocamlduce
 www-servers/ocsigen ocamlduce
 dev-ml/eliom ocamlduce
 
-# GNOME <gnome@gentoo.org> (02 Oct 2012)
-# Mask USE="udisks" and use USE="gdu" as the default for <gnome-base/gvfs-1.14;
-# older gvfs releases have problems with recent stable udisks:2 (bug #463792)
-<gnome-base/gvfs-1.14 udisks
-
 # Pawel Hajdan jr <phajdan.jr@gentoo.org> (28 Sep 2012)
 # Causes problems with old NVidia drivers, bug #413637.
 <www-client/chromium-32.0.1700.19 tcmalloc
@@ -571,11 +562,6 @@ app-arch/libzpaq jit
 # Mask xen USE flag by default, unmask on x86/amd64 where it is supported.
 media-sound/pulseaudio webrtc-aec xen
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (27 Mar 2012)
-# Requires libxkbcommon from the x11 overlay
-<dev-cpp/gtkmm-3.7 wayland
-<x11-libs/gtk+-3.7 egl wayland
-
 # Samuli Suominen <ssuominen@gentoo.org> (20 Mar 2012)
 # This is for udev-acl. Unmasked in default/linux/package.use.mask.
 sys-auth/consolekit acl
@@ -629,10 +615,6 @@ www-client/links suid
 # fixes it bug #385683
 dev-lang/path64 debugger
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (31 Oct 2011)
-# Let's not suddenly enable clutter on stable evolution versions
-<mail-client/evolution-3 clutter
-
 # Samuli Suominen <ssuominen@gentoo.org> (16 Oct 2011)
 # Mask libbluray support here, and enable it per arch instead
 gnome-base/gvfs bluray
@@ -647,13 +629,6 @@ gnome-base/gvfs bluray
 # Temporarily mask instead of dropping keywords, bug 384647
 dev-libs/glib systemtap
 
-# Nirbheek Chauhan <nirbheek@gentoo.org> (16 Aug 2011)
-# Mask introspection on ebuilds that went stable before it was unmasked.
-# As these ebuilds are cleaned from the tree, the masks can be removed.
-<app-crypt/seahorse-2.32.0-r1 introspection
-<media-libs/babl-0.1.4-r1 introspection
-<www-client/epiphany-3 introspection
-
 # Robin H. Johnson <robbat2@gentoo.org> (10 Jul 2011)
 # PPS should work on all arches, but only keyworded on amd64/x86
 >=net-misc/ntp-4.2.6_p3-r1 parse-clocks
@@ -682,9 +657,7 @@ net-dns/pdnsd isdn urandom
 
 # Tomáš Chvátal <scarabeus@gentoo.org> (8 Sep 2010)
 # drm don't even build here so mask everywhere expect live.
-# openvg require openvg-1.1 implemenatation so mask until there is some
 <x11-libs/cairo-9999 drm
-<x11-libs/cairo-1.12 openvg
 
 # Alex Legler <a3li@gentoo.org> (1 Sep 2010)
 # This feature is marked as experimental by upstream.
@@ -726,12 +699,6 @@ sci-chemistry/gamess mpi
 # Mask cuda for k3d. Works only on amd64/x86. Bug 267264
 media-gfx/k3d cuda
 
-# Gilles Dartiguelongue <eva@gentoo.org> (01 Nov 2009)
-# Broken on so many setups it is just insane.
-# 0.7 is API/ABI incompatible but is the way to go.
-# Masking to lower maintainance headache, bug #291501.
-media-video/totem tracker
-
 # Tomáš Chvátal <scarabeus@gentoo.org> (27 Oct 2009)
 # Broken on so many setups it is just insane.
 # Unmask if you really know what you are doing.
diff --git a/profiles/features/64bit-native/package.mask b/profiles/features/64bit-native/package.mask
index ef4a9986468e..4059336fcef9 100644
--- a/profiles/features/64bit-native/package.mask
+++ b/profiles/features/64bit-native/package.mask
@@ -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/profiles/features/64bit-native/package.mask,v 1.104 2015/06/02 09:15:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/package.mask,v 1.105 2015/06/27 17:54:43 tetromino Exp $
 
 # Andreas K. Huettel <dilfridge@gentoo.org>
 # Novell Groupwise Client sadly needs a 32bit java vm (bundled)
@@ -26,7 +26,6 @@ app-emulation/vmware-player
 app-office/lotus-notes
 app-office/ooextras
 app-emulation/winetricks
-app-emulation/wine-doors
 app-text/acroread
 dev-embedded/libftd2xx
 dev-embedded/openocd
@@ -116,7 +115,6 @@ games-rpg/nwn-penultima
 games-rpg/nwn-penultimarerolled
 games-rpg/nwn-shadowlordsdreamcatcherdemon
 games-rpg/penumbra-collection
-games-rpg/rain-slick
 games-rpg/sacred-gold
 games-server/etqw-ded
 games-server/nwn-ded
diff --git a/profiles/features/64bit-native/package.use.mask b/profiles/features/64bit-native/package.use.mask
index a3f244c944ea..282e711cd006 100644
--- a/profiles/features/64bit-native/package.use.mask
+++ b/profiles/features/64bit-native/package.use.mask
@@ -1,10 +1,10 @@
-# 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/profiles/features/64bit-native/package.use.mask,v 1.11 2014/11/13 08:53:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/package.use.mask,v 1.12 2015/06/27 17:54:43 tetromino Exp $
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (04 Jul 2012)
 # Disable 32-bit parts of wine, bug #351436
-app-emulation/wine mono win32
+app-emulation/wine mono
 
 # Apr 28, 2008 Sébastien Fabbro <bicatali@gentoo.org>
 # ifc masked
diff --git a/profiles/package.mask b/profiles/package.mask
index d3f5bf747e35..27b7ac115374 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16637 2015/06/25 15:45:28 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16639 2015/06/26 21:39:39 johu 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,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Johannes Huber <johu@gentoo.org> (26 Jun 2015)
+# Mask for removal in 30 days. Segfaults on startup, bug #505314.
+# Last release in 2010. Non upstream repository, bug #544822.
+app-portage/kportagetray
+
 # Michael Sterrett <mr_bones_@gentoo.org> (25 Jun 2015)
 # Upstream seems dead; no release since 2006
 # lots of bugs: #252719, #315255, #314459, #159630, #376589, #420783, #540928
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 2816a1ee2e4b..29f9f0a574c0 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1044,6 +1044,7 @@ app-office/scribus:osg - 3D redering via dev-games/openscenegraph
 app-office/scribus:scripts - Install the scripts
 app-office/scribus:templates - Document tamplates
 app-office/scribus:tk - Install tk based scripts e.g. FontSample.py
+app-office/skrooge:activities - Enable kactivities support
 app-office/texmacs:netpbm - Add support for media-libs/netpbm
 app-office/texmacs:pdf - Add the experimental native pdf export
 app-office/texstudio:video - Use phonon for video embedding
@@ -1240,7 +1241,6 @@ dev-db/cppdb:sqlite_internal - Don't build a separate sqlite3 loadable module bu
 dev-db/drizzle:curl - Enable the HTTP authentication plugin (using net-misc/curl). This is needed for the tests to apply properly.
 dev-db/drizzle:doc - Build the API documentation for the package, using app-doc/doxygen. Warning, this might take over an hour on slower machines.
 dev-db/drizzle:gearman - Enable the gearman plugins for user-defined functions and logging (using sys-cluster/gearman).
-dev-db/drizzle:haildb - Use the dev-db/haildb libraries to replace the innodb plugin storage engine with haildb (an innodb fork).
 dev-db/drizzle:md5 - Enable the MD5 plugin, using dev-libs/libgcrypt; this replaces the older openssl and gnutls USE flags.
 dev-db/drizzle:memcache - Enable the memcache plugin for user-defined functions and statistics in I_S tables (using dev-libs/libmemcached). Currently restricts tests because of an upstream testsuite bug.
 dev-db/drizzle:pam - Enable the PAM authentication plugin (using sys-libs/pam). The configuration file created will be /etc/pam.d/drizzle.
@@ -1609,7 +1609,6 @@ dev-java/eclipse-ecj:ant - Support using ecj in Ant builds via dev-java/ant-ecli
 dev-java/emma:launcher - Install /usr/bin/emma. Collides with sci-biology/emboss.
 dev-java/fop:hyphenation - Precompile hyphenation patterns from the dev-java/offo-hyphenation package and install them as fop-hyph.jar
 dev-java/fop:jai - Enable jai support
-dev-java/fop:jimi - Enable jimi support
 dev-java/gjdoc:xmldoclet - Also build support for the xml doclet that generates output in xml instead of the traditional html javadoc.
 dev-java/gnu-classpath:alsa - Build with ALSA javax.sound.midi provider
 dev-java/gnu-classpath:dssi - Build with DSSI javax.sound.midi provider
@@ -1620,8 +1619,6 @@ dev-java/gnu-classpath:gstreamer - Build with GStreamer javax.sound.sampler prov
 dev-java/gnu-classpath:gtk - Build with Gtk+ AWT peers
 dev-java/gnu-classpath:qt4 - Build with Qt4 AWT peers
 dev-java/gnu-classpath:xml - Build with native XML backend
-dev-java/httpcomponents-client:deprecated - Build deprecated classes
-dev-java/httpcomponents-core:deprecated - Build deprecated classes
 dev-java/ibm-jdk-bin:javacomm - Enable Java Communications API support
 dev-java/icedtea:X - Make X buildtime-only depenency.
 dev-java/icedtea:alsa - Make alsa buildtime-only dependency.
@@ -4350,6 +4347,7 @@ media-tv/mythtv:lcd - Tells MythTV that you have an instance of app-misc/lcdproc
 media-tv/mythtv:lirc - Adds LIRC support directly to MythTV allowing for built in control via a LIRC device.
 media-tv/mythtv:perl - Builds the perl bindings for MythTV. Allows you to write scripts in Perl to control your MythTV setup or communicate with it.
 media-tv/mythtv:raop - Remote Audio Output Protocol (aka AirTunes/AirPlay)
+media-tv/mythtv:wrapper - Use Ubuntu mythtfrontend wrapper.
 media-tv/mythtv:xmltv - Pulls in the media-tv/xmltv TV listing grabbers for users not using Schedules Direct.
 media-tv/tvbrowser:themes - Install extra theme packs
 media-tv/tvheadend:ccache - Use dev-util/ccache
@@ -4461,6 +4459,7 @@ media-video/ffmpeg:postproc - Build and install libpostproc.
 media-video/ffmpeg:quvi - Adds support for playing media from Internet services using the quvi project.
 media-video/ffmpeg:rtmp - Enable Real Time Messaging Protocol using librtmp
 media-video/ffmpeg:schroedinger - Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).
+media-video/ffmpeg:snappy - Enable app-arch/snappy support. Required for e.g. Vidvox Hap encoder.
 media-video/ffmpeg:ssh - Enable SSH/sftp support via net-libs/libssh.
 media-video/ffmpeg:twolame - Enables MP2 encoding via media-sound/twolame as an alternative to the internal encoder.
 media-video/ffmpeg:vis - Adds support for SIMD optimizations for UltraSPARC processors.
@@ -4742,7 +4741,6 @@ net-analyzer/icinga-web:pnp - Enables pnp4nagios integration
 net-analyzer/icinga2:classicui - Adds support for the old interface
 net-analyzer/icinga2:nano-syntax - Adds support for syntax used in the nano editor
 net-analyzer/icinga2:plugins - Adds support for nagios plugins
-net-analyzer/linkchecker:login - login form submission
 net-analyzer/linkchecker:sqlite - Mozilla Bookmark parsing
 net-analyzer/metasploit:development - Install dependencies needed for metasploit and exploit development
 net-analyzer/metasploit:lorcon - Enable lorcon for raw packet injection
@@ -7322,6 +7320,7 @@ sys-kernel/genkernel-next:mdadm - Enable support for mdadm (include mdadm depend
 sys-kernel/genkernel-next:plymouth - Enable support for Plymouth (include Plymouth dependency)
 sys-kernel/gentoo-sources:deblob - Remove binary blobs from kernel sources to provide libre license compliance.
 sys-kernel/gentoo-sources:experimental - Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".
+sys-kernel/gentoo-sources:kdbus - Apply the kdbus patch. This also requires the "experimental" use flag.
 sys-kernel/hardened-sources:deblob - Remove binary blobs from kernel sources to provide libre license compliance.
 sys-kernel/linux-docs:html - Install HTML documentation
 sys-kernel/linux-firmware:savedconfig - Allows individual selection of firmware files
diff --git a/sci-chemistry/freeon/Manifest b/sci-chemistry/freeon/Manifest
index fc703c0671b8..39a7e4aedcc1 100644
--- a/sci-chemistry/freeon/Manifest
+++ b/sci-chemistry/freeon/Manifest
@@ -1 +1,2 @@
+DIST freeon-1.0.10.tar.bz2 5872019 SHA256 01f0086a53930afb3078a2794baa1fccdacdc4a23082725cb016068d5a10ec38 SHA512 5bae89d6421600792bf986f6fb7504d321d5d51782587237ecba35191e54c1ec6c5ea1fdc50ed2d339551c527e4efcc5421048ccce0404c4b06875cbd0800862 WHIRLPOOL 84fcf7ca4d62e5a2407f2920f9a13fd2a4930f2637d098954b3be81f540e4a10344d17053a1d05046c2743f317a8898886148439d51364ce10dc66a313eadb8b
 DIST freeon-1.0.8.tar.bz2 5957707 SHA256 ae14c1b640e4dcd9f18d2807f2debf9fc005b7451401e3e5d7b9dc76919f381d SHA512 1227f670a73b4ea39beb26e4136ad535e126ad17d66171c31b3bd403a3886eee150cda865806a2d9dad85646ccb086a6be4f645455eab24603cb064fb725efbd WHIRLPOOL b41a3b1e4bb152309a12ac0c4fec07c932809bb465af4b08cb76f6e0bf089c4d91682e1428c47d1adb449d153a1338cd3d540e860ca22774a299e21da44a16c1
diff --git a/sci-chemistry/freeon/freeon-1.0.10.ebuild b/sci-chemistry/freeon/freeon-1.0.10.ebuild
new file mode 100644
index 000000000000..08737e88a7c6
--- /dev/null
+++ b/sci-chemistry/freeon/freeon-1.0.10.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/freeon/freeon-1.0.10.ebuild,v 1.1 2015/06/26 16:16:47 nicolasbock Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+FORTRAN_STANDARD=90
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit autotools-utils fortran-2 python-any-r1
+
+DESCRIPTION="An experimental suite of programs for linear scaling quantum chemistry"
+HOMEPAGE="http://www.freeon.org"
+SRC_URI="http://download.savannah.gnu.org/releases/${PN}/${PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	sci-libs/hdf5
+	virtual/blas
+	virtual/lapack"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}"
diff --git a/sci-chemistry/freeon/metadata.xml b/sci-chemistry/freeon/metadata.xml
index 71873a14103f..eba82069680b 100644
--- a/sci-chemistry/freeon/metadata.xml
+++ b/sci-chemistry/freeon/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <longdescription lang="en">
+	<longdescription lang="en">
 		FreeON is an experimental, open source (GPL) suite of programs for linear scaling quantum chemistry.
 	</longdescription>
-  <herd>sci-chemistry</herd>
-  <maintainer>
-    <email>nicolasbock@gentoo.org</email>
-    <name>Nicolas Bock</name>
-  </maintainer>
+	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>nicolasbock@gentoo.org</email>
+		<name>Nicolas Bock</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/namd/metadata.xml b/sci-chemistry/namd/metadata.xml
index 2e327cd996d3..c73650100bed 100644
--- a/sci-chemistry/namd/metadata.xml
+++ b/sci-chemistry/namd/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-chemistry</herd>
-  <maintainer>
-    <email>nicolasbock@gentoo.org</email>
-  </maintainer>
+	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>nicolasbock@gentoo.org</email>
+		<name>Nicolas Bock</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sci-chemistry/openbabel-perl/openbabel-perl-2.3.2.ebuild b/sci-chemistry/openbabel-perl/openbabel-perl-2.3.2.ebuild
index 12132b73c2f7..84a5bd02793c 100644
--- a/sci-chemistry/openbabel-perl/openbabel-perl-2.3.2.ebuild
+++ b/sci-chemistry/openbabel-perl/openbabel-perl-2.3.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-chemistry/openbabel-perl/openbabel-perl-2.3.2.ebuild,v 1.7 2015/03/02 09:22:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel-perl/openbabel-perl-2.3.2.ebuild,v 1.8 2015/06/28 11:20:25 zlogene Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ DESCRIPTION="Perl bindings for OpenBabel"
 HOMEPAGE="http://openbabel.sourceforge.net/"
 SRC_URI="mirror://sourceforge/openbabel/openbabel-${PV}.tar.gz"
 
-KEYWORDS="amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
diff --git a/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild b/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild
index b11e53068756..dc614dae0327 100644
--- a/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild
+++ b/sci-chemistry/openbabel-python/openbabel-python-2.3.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-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild,v 1.14 2015/05/05 09:41:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel-python/openbabel-python-2.3.2.ebuild,v 1.15 2015/06/28 11:21:54 zlogene Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="Python bindings for OpenBabel (including Pybel)"
 HOMEPAGE="http://openbabel.sourceforge.net/"
 SRC_URI="mirror://sourceforge/openbabel/openbabel-${PV}.tar.gz"
 
-KEYWORDS="amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
diff --git a/sci-chemistry/openbabel/openbabel-2.3.2.ebuild b/sci-chemistry/openbabel/openbabel-2.3.2.ebuild
index c493c9576df9..3c5e2d8137e7 100644
--- a/sci-chemistry/openbabel/openbabel-2.3.2.ebuild
+++ b/sci-chemistry/openbabel/openbabel-2.3.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-chemistry/openbabel/openbabel-2.3.2.ebuild,v 1.6 2015/03/02 09:22:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/openbabel-2.3.2.ebuild,v 1.7 2015/06/28 11:18:49 zlogene Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/openbabel/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc openmp test wxwidgets"
 
 RDEPEND="
diff --git a/sci-geosciences/osm-gps-map/metadata.xml b/sci-geosciences/osm-gps-map/metadata.xml
index b3e142e979de..58a20a4d2d56 100644
--- a/sci-geosciences/osm-gps-map/metadata.xml
+++ b/sci-geosciences/osm-gps-map/metadata.xml
@@ -2,11 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
-    <email>aaron@flappyport.com</email>
+    <email>bman@gentoo.org</email>
     <name>Aaron Bauman</name>
-    <description>Proxy maintainer. Assign bugs to him.</description>
   </maintainer>
-  <herd>proxy-maintainers</herd>
   <longdescription lang="en">
     A gtk+ viewer for OpenStreetMap files.
   </longdescription>
diff --git a/sci-libs/cln/cln-1.3.3.ebuild b/sci-libs/cln/cln-1.3.3.ebuild
index d84e8279dee6..b7fbf72b7c37 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.10 2015/05/13 06:56:48 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cln/cln-1.3.3.ebuild,v 1.11 2015/06/27 12:35:53 maekke 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/fftw/fftw-2.1.5-r8.ebuild b/sci-libs/fftw/fftw-2.1.5-r8.ebuild
index 79bf5c85f612..ed542fb8ad55 100644
--- a/sci-libs/fftw/fftw-2.1.5-r8.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r8.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/sci-libs/fftw/fftw-2.1.5-r8.ebuild,v 1.18 2014/08/28 15:44:22 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r8.ebuild,v 1.19 2015/06/26 14:43:16 radhermit Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ DEPEND="mpi? ( virtual/mpi )"
 RDEPEND="${DEPEND}"
 
 SLOT="2.1"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 IUSE="doc float fortran mpi openmp threads static-libs"
 
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
diff --git a/sci-libs/fftw/fftw-3.3.4.ebuild b/sci-libs/fftw/fftw-3.3.4.ebuild
index f73edd4766c5..2e712ff5c317 100644
--- a/sci-libs/fftw/fftw-3.3.4.ebuild
+++ b/sci-libs/fftw/fftw-3.3.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/sci-libs/fftw/fftw-3.3.4.ebuild,v 1.15 2015/02/28 13:57:47 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild,v 1.16 2015/06/26 14:43:16 radhermit Exp $
 
 EAPI=5
 
@@ -21,7 +21,7 @@ else
 	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="3.0/3"
 IUSE="altivec cpu_flags_x86_avx doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran mpi neon openmp quad cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs test threads zbus"
 
diff --git a/sci-libs/liborigin/liborigin-20110829.ebuild b/sci-libs/liborigin/liborigin-20110829.ebuild
index 236b939c3273..b6c1b9369a27 100644
--- a/sci-libs/liborigin/liborigin-20110829.ebuild
+++ b/sci-libs/liborigin/liborigin-20110829.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/liborigin/liborigin-20110829.ebuild,v 1.4 2015/06/24 10:19:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/liborigin/liborigin-20110829.ebuild,v 1.5 2015/06/26 12:14:36 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://dev.gentoo.org/~dilfridge/distfiles/${PN}2-${PV}.zip"
 
 LICENSE="GPL-3"
 SLOT="2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/sci-libs/pymmlib/pymmlib-1.2.1.ebuild b/sci-libs/pymmlib/pymmlib-1.2.1.ebuild
index 1d07c83f8fab..cada4f9afb87 100644
--- a/sci-libs/pymmlib/pymmlib-1.2.1.ebuild
+++ b/sci-libs/pymmlib/pymmlib-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/sci-libs/pymmlib/pymmlib-1.2.1.ebuild,v 1.2 2015/04/08 18:49:16 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/pymmlib/pymmlib-1.2.1.ebuild,v 1.3 2015/06/26 12:14:21 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://github/masci/mmLib/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/sci-mathematics/coq/coq-8.4_p5.ebuild b/sci-mathematics/coq/coq-8.4_p5.ebuild
index cdae7204a41b..f8bb97a5ed28 100644
--- a/sci-mathematics/coq/coq-8.4_p5.ebuild
+++ b/sci-mathematics/coq/coq-8.4_p5.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-mathematics/coq/coq-8.4_p5.ebuild,v 1.3 2015/02/15 06:46:47 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.4_p5.ebuild,v 1.4 2015/06/27 09:48:20 ago Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ SRC_URI="http://${PN}.inria.fr/distrib/V${MY_PV}/files/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="gtk debug +ocamlopt doc camlp5"
 
 RDEPEND="
diff --git a/sci-physics/lammps/lammps-20150515.ebuild b/sci-physics/lammps/lammps-20150515.ebuild
index 4631fbeb4184..7dc225409c7f 100644
--- a/sci-physics/lammps/lammps-20150515.ebuild
+++ b/sci-physics/lammps/lammps-20150515.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-physics/lammps/lammps-20150515.ebuild,v 1.1 2015/05/18 22:49:06 nicolasbock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/lammps/lammps-20150515.ebuild,v 1.2 2015/06/26 12:14:57 ago Exp $
 
 EAPI=5
 
@@ -47,7 +47,7 @@ SRC_URI="http://lammps.sandia.gov/tars/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc examples gzip lammps-memalign mpi python static-libs"
 
 DEPEND="
diff --git a/sys-apps/install-xattr/install-xattr-0.5.ebuild b/sys-apps/install-xattr/install-xattr-0.5.ebuild
index e1a3e642eead..f03acbc177cc 100644
--- a/sys-apps/install-xattr/install-xattr-0.5.ebuild
+++ b/sys-apps/install-xattr/install-xattr-0.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/sys-apps/install-xattr/install-xattr-0.5.ebuild,v 1.1 2015/06/08 13:12:32 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/install-xattr/install-xattr-0.5.ebuild,v 1.5 2015/06/28 08:52:45 jer Exp $
 
 EAPI=5
 DESCRIPTION="Wrapper to coreutil's install to preserve Filesystem Extended Attributes"
@@ -10,11 +10,11 @@ inherit toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://anongit.gentoo.org/proj/elfix.git"
-	KEYWORDS=""
+	KEYWORDS="hppa"
 	inherit git-2
 else
 	SRC_URI="http://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2"
-	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"
 	S=${WORKDIR}/${PN}
 fi
 
diff --git a/sys-apps/openrc/openrc-0.16.4.ebuild b/sys-apps/openrc/openrc-0.16.4.ebuild
index 367ca6a57df0..361440b5984e 100644
--- a/sys-apps/openrc/openrc-0.16.4.ebuild
+++ b/sys-apps/openrc/openrc-0.16.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-apps/openrc/openrc-0.16.4.ebuild,v 1.7 2015/06/21 18:11:17 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/openrc/openrc-0.16.4.ebuild,v 1.8 2015/06/27 14:00:46 zlogene Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 990f719f2a01..5a8331c08aef 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -4,4 +4,5 @@ DIST systemd-219_p112.tar.xz 3944604 SHA256 8394ca0d55b05cb07c2187da8b614f3cb4ea
 DIST systemd-220-gentoo-r2.tar.xz 7008 SHA256 9d40328056437d0ad799ef6c659e1017cba482888b8f03b8b4628990d79b2a20 SHA512 b0c45d73ee0d0be114f48f4e071a596d6d069c04c8012761aae33658fe569f6ab89e6df370101432484c288b79eb1aef6f0e6c586ce0237c455c7ba6e23d3ab7 WHIRLPOOL 2b017f5d453bd485203a613f6cad424067cb4f561c070e3b2574fdfa1877da3ab45e98d647eec463df8c625c2ce13d7289f439f5ac7a76c2d4f44b256a834d24
 DIST systemd-220-src-boot-efi.tar.xz 19024 SHA256 63aa064938e6d295a2ac4b308876c161aff9eddd1d2012cec0ce00d9b8423469 SHA512 33f8b7d2d09c7dc2f9c55791ab855e3b1763a17db8dd534f67bc4b116def905c2782039e38bb93cd071b198ef582b1d923a5eb15b97a0d6983cb0afffdccdef9 WHIRLPOOL 675654d1fe5c021d7f9ec10d439ccd959812e69b0b816cbdb12508516e41be416a0e7adcb556f49aa7abfaceba4f682ccd353628ddf87cc8d507e5e75ea750b8
 DIST systemd-220.tar.xz 4036028 SHA256 3659588c40221ee7257502c0735491f72796dbe17be560013f6d310deb446332 SHA512 c309b4309f8b8d2d97450fb281053feec7b89227626b69e37f3a0d2154c2810c217e58e218f17da11c04f703c6196cec21c4afdcf63879bc736bbdca058a5da5 WHIRLPOOL 2f8974eacb706987e85c7907a517f6b2d47b009f9259a36375537c8bd09bc4774c81e8dc853aa83e644d7c1b579f5113d0bb8a504c7caa5a9240750f9936d561
+DIST systemd-221.tar.xz 4010048 SHA256 085e088650afbfc688ccb13459aedb1fbc7c8810358605b076301f472d51cc4f SHA512 db2552674f1d656e0398b461b42738fcad40dd64700700a7041650581981e7ac563652ef45b859f73a74058bf0a428c26402b5356cfe50b59c20c2678441ab0f WHIRLPOOL 00939e03a780972ef9ce3a8833ed150c067d86094ea11b92baba42469969653ed8f156744fcde1809df6b127f48e82d73391aec9340146829d83312a40cfb138
 DIST systemd.conf.m4-v219 1493 SHA256 90ee489b6e34945e5cda27a269e1247644382084f5a145a2df691282007c6768 SHA512 a117c40229af3ba2a0cec4c3db01728c3cab49bb6403fc84cb34f8a09979d98f7a200cd28bf2bbc7a71cbad856edf31190fba30a9d5810c55911746457bbf31a WHIRLPOOL a1604a4fdf5e2d4a4505252859c64d0a3c131b4bb371cff8c75331438f291f138d2732d939947988ab95b040e377412db84fbf6c45866fee028a2aac70e8eb9f
diff --git a/sys-apps/systemd/systemd-221.ebuild b/sys-apps/systemd/systemd-221.ebuild
new file mode 100644
index 000000000000..9a40c6d4732a
--- /dev/null
+++ b/sys-apps/systemd/systemd-221.ebuild
@@ -0,0 +1,489 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-221.ebuild,v 1.1 2015/06/27 18:00:47 floppym Exp $
+
+EAPI=5
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+if [[ ${PV} == 9999 ]]; then
+	AUTOTOOLS_AUTORECONF=yes
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	SRC_URI="http://www.freedesktop.org/software/systemd/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+fi
+
+inherit autotools-utils bash-completion-r1 linux-info multilib \
+	multilib-minimal pam python-single-r1 systemd toolchain-funcs udev \
+	user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit cryptsetup curl elfutils gcrypt gnuefi http
+	idn importd +kdbus +kmod +lz4 lzma nat pam policykit python
+	qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+MINKV="3.8"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.26:0=
+	sys-libs/libcap:0=
+	!<sys-libs/glibc-2.16
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=
+		ssl? ( >=net-libs/gnutls-3.1.4:0= )
+	)
+	idn? ( net-dns/libidn:0= )
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p119:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( virtual/pam:= )
+	python? ( ${PYTHON_DEPS} )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( sys-libs/libseccomp:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	sysv-utils? (
+		!sys-apps/systemd-sysv-utils
+		!sys-apps/sysvinit )
+	terminal? ( >=dev-libs/libevdev-1.2:0=
+		>=x11-libs/libxkbcommon-0.5:0=
+		>=x11-libs/libdrm-2.4:0= )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/baselayout-2.2
+	!sys-auth/nss-myhostname
+	!sys-fs/eudev
+	!sys-fs/udev"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.6.8-r1:0[systemd]
+	>=sys-apps/hwids-20130717-r1[udev]
+	>=sys-fs/udev-init-scripts-25
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	>=sys-devel/binutils-2.23.1
+	>=sys-devel/gcc-4.6
+	>=sys-kernel/linux-headers-${MINKV}
+	ia64? ( >=sys-kernel/linux-headers-3.9 )
+	virtual/pkgconfig
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+	python? ( dev-python/lxml[${PYTHON_USEDEP}] )
+	terminal? ( media-fonts/unifont[utils(+)] )
+	test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
+
+if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
+	DEPEND+="
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt:0
+		>=dev-libs/libgcrypt-1.4.5:0"
+fi
+
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+=" ${PYTHON_DEPS}"
+	REQUIRED_USE+=" ${PYTHON_REQUIRED_USE}"
+fi
+
+pkg_pretend() {
+	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+		~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
+		~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SECCOMP ~SIGNALFD ~SYSFS
+		~TIMERFD ~TMPFS_XATTR
+		~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+		~!SYSFS_DEPRECATED_V2"
+
+	use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+	kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+
+	if linux_config_exists; then
+		local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+	fi
+
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if [[ $(gcc-major-version) -lt 4
+			|| ( $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 6 ) ]]
+		then
+			eerror "systemd requires at least gcc 4.6 to build. Please switch the active"
+			eerror "gcc version using gcc-config."
+			die "systemd requires at least gcc 4.6"
+		fi
+	fi
+
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_prepare() {
+	# Bug 463376
+	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
+
+	if [[ ${PV} != 9999 ]]; then
+		# Update the timestamp on this to avoid rebuilding it.
+		[[ -e src/libsystemd-terminal/unifont-glyph-array.bin ]] || die "File missing from tarball"
+		touch src/libsystemd-terminal/unifont-glyph-array.bin || die
+	fi
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	# Keep using the one where the rules were installed.
+	MY_UDEVDIR=$(get_udevdir)
+	# Fix systems broken by bug #509454.
+	[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
+
+	if [[ ${PV} == 9999 ]] || use python; then
+		python_setup
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		# disable -flto since it is an optimization flag
+		# and makes distcc less effective
+		cc_cv_CFLAGS__flto=no
+
+		# Workaround for bug 516346
+		--enable-dependency-tracking
+
+		--disable-maintainer-mode
+		--localstatedir=/var
+		--with-pamlibdir=$(getpam_mod_dir)
+		# avoid bash-completion dep
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in $PATH
+		--enable-split-usr
+		# For testing.
+		--with-rootprefix="${ROOTPREFIX-/usr}"
+		--with-rootlibdir="${ROOTPREFIX-/usr}/$(get_libdir)"
+		# disable sysv compatibility
+		--with-sysvinit-path=
+		--with-sysvrcnd-path=
+		# no deps
+		--enable-efi
+		--enable-ima
+
+		# Optional components/dependencies
+		$(multilib_native_use_enable acl)
+		$(multilib_native_use_enable apparmor)
+		$(multilib_native_use_enable audit)
+		$(multilib_native_use_enable cryptsetup libcryptsetup)
+		$(multilib_native_use_enable curl libcurl)
+		$(multilib_native_use_enable elfutils)
+		$(use_enable gcrypt)
+		$(multilib_native_use_enable gnuefi)
+		$(multilib_native_use_enable http microhttpd)
+		$(usex http $(multilib_native_use_enable ssl gnutls) --disable-gnutls)
+		$(multilib_native_use_enable idn libidn)
+		$(multilib_native_use_enable importd)
+		$(multilib_native_use_enable importd bzip2)
+		$(multilib_native_use_enable importd zlib)
+		$(use_enable kdbus)
+		$(multilib_native_use_enable kmod)
+		$(use_enable lz4)
+		$(use_enable lzma xz)
+		$(multilib_native_use_enable nat libiptc)
+		$(multilib_native_use_enable pam)
+		$(multilib_native_use_enable policykit polkit)
+		$(multilib_native_use_with python)
+		$(multilib_native_use_enable python python-devel)
+		$(multilib_native_use_enable qrcode qrencode)
+		$(multilib_native_use_enable seccomp)
+		$(multilib_native_use_enable selinux)
+		$(multilib_native_use_enable terminal)
+		$(multilib_native_use_enable test tests)
+		$(multilib_native_use_enable test dbus)
+		$(multilib_native_use_enable xkb xkbcommon)
+
+		# hardcode a few paths to spare some deps
+		QUOTAON=/usr/sbin/quotaon
+		QUOTACHECK=/usr/sbin/quotacheck
+
+		# TODO: we may need to restrict this to gcc
+		EFI_CC="$(tc-getCC)"
+
+		# dbus paths
+		--with-dbuspolicydir="${EPREFIX}/etc/dbus-1/system.d"
+		--with-dbussessionservicedir="${EPREFIX}/usr/share/dbus-1/services"
+		--with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services"
+
+		--with-ntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+	)
+
+	if ! multilib_is_native_abi; then
+		myeconfargs+=(
+			MOUNT_{CFLAGS,LIBS}=' '
+
+			ac_cv_search_cap_init=
+			ac_cv_header_sys_capability_h=yes
+		)
+	fi
+
+	# Work around bug 463846.
+	tc-export CC
+
+	autotools-utils_src_configure
+}
+
+multilib_src_compile() {
+	local mymakeopts=(
+		udevlibexecdir="${MY_UDEVDIR}"
+	)
+
+	if multilib_is_native_abi; then
+		emake "${mymakeopts[@]}"
+	else
+		echo 'gentoo: $(BUILT_SOURCES)' | \
+		emake "${mymakeopts[@]}" -f Makefile -f - gentoo
+		echo 'gentoo: $(lib_LTLIBRARIES) $(pkgconfiglib_DATA)' | \
+		emake "${mymakeopts[@]}" -f Makefile -f - gentoo
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi || continue
+
+	default
+}
+
+multilib_src_install() {
+	local mymakeopts=(
+		# automake fails with parallel libtool relinking
+		# https://bugs.gentoo.org/show_bug.cgi?id=491398
+		-j1
+
+		udevlibexecdir="${MY_UDEVDIR}"
+		dist_udevhwdb_DATA=
+		DESTDIR="${D}"
+	)
+
+	if multilib_is_native_abi; then
+		emake "${mymakeopts[@]}" install
+	else
+		mymakeopts+=(
+			install-libLTLIBRARIES
+			install-pkgconfiglibDATA
+			install-includeHEADERS
+			# safe to call unconditionally, 'installs' empty list
+			install-pkgincludeHEADERS
+		)
+
+		emake "${mymakeopts[@]}"
+	fi
+
+	# install compat pkg-config files
+	# Change dbus to >=sys-apps/dbus-1.8.8 if/when this is dropped.
+	local pcfiles=( src/compat-libs/libsystemd-{daemon,id128,journal,login}.pc )
+	emake "${mymakeopts[@]}" install-pkgconfiglibDATA \
+		pkgconfiglib_DATA="${pcfiles[*]}"
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --modules
+	einstalldocs
+
+	if use sysv-utils; then
+		for app in halt poweroff reboot runlevel shutdown telinit; do
+			dosym "..${ROOTPREFIX-/usr}/bin/systemctl" /sbin/${app}
+		done
+		dosym "..${ROOTPREFIX-/usr}/lib/systemd/systemd" /sbin/init
+	else
+		# we just keep sysvinit tools, so no need for the mans
+		rm "${D}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+			|| die
+		rm "${D}"/usr/share/man/man1/init.1 || die
+	fi
+
+	# Disable storing coredumps in journald, bug #433457
+	mv "${D}"/usr/lib/sysctl.d/50-coredump.conf{,.disabled} || die
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
+		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \
+		/var/log/journal/remote
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	# If we install these symlinks, there is no way for the sysadmin to remove them
+	# permanently.
+	rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+	rm "${D}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+	rm -r "${D}"/etc/systemd/system/network-online.target.wants || die
+	rm -r "${D}"/etc/systemd/system/sysinit.target.wants || die
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
+	local locale_conf="${EROOT%/}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+migrate_net_name_slot() {
+	# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
+	# do the same for 80-net-setup-link.rules to keep the old behavior
+	local net_move=no
+	local net_name_slot_sym=no
+	local net_rules_path="${EROOT%/}"/etc/udev/rules.d
+	local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
+	local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
+	if [[ -e ${net_setup_link} ]]; then
+		net_move=no
+	elif [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]]; then
+		net_move=yes
+	elif [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
+		net_move=yes
+		net_name_slot_sym=yes
+	fi
+	if [[ ${net_move} == yes ]]; then
+		ebegin "Copying ${net_name_slot} to ${net_setup_link}"
+
+		if [[ ${net_name_slot_sym} == yes ]]; then
+			ln -nfs /dev/null "${net_setup_link}"
+		else
+			cp "${net_name_slot}" "${net_setup_link}"
+		fi
+		eend $? || FAIL=1
+	fi
+}
+
+pkg_postinst() {
+	newusergroup() {
+		enewgroup "$1"
+		enewuser "$1" -1 -1 -1 "$1"
+	}
+
+	enewgroup input
+	enewgroup systemd-journal
+	newusergroup systemd-bus-proxy
+	newusergroup systemd-journal-gateway
+	newusergroup systemd-journal-remote
+	newusergroup systemd-journal-upload
+	newusergroup systemd-network
+	newusergroup systemd-resolve
+	newusergroup systemd-timesync
+	use http && newusergroup systemd-journal-gateway
+
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${ROOT%/}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	# Migrate 80-net-name-slot.rules -> 80-net-setup-link.rules
+	migrate_net_name_slot
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+
+	if [[ $(readlink "${ROOT}"/etc/resolv.conf) == */run/systemd/network/resolv.conf ]]; then
+		ewarn "resolv.conf is now generated by systemd-resolved. To use it, enable"
+		ewarn "systemd-resolved.service, and create a symlink from /etc/resolv.conf"
+		ewarn "to /run/systemd/resolve/resolv.conf"
+		ewarn
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 903e0392ae36..a078c93d63d6 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-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/sys-apps/systemd/systemd-9999.ebuild,v 1.173 2015/06/21 15:29:53 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/systemd/systemd-9999.ebuild,v 1.174 2015/06/27 18:00:47 floppym Exp $
 
 EAPI=5
 
@@ -28,7 +28,9 @@ SLOT="0/2"
 IUSE="acl apparmor audit cryptsetup curl elfutils gcrypt gnuefi http
 	idn importd +kdbus +kmod +lz4 lzma nat pam policykit python
 	qrcode +seccomp selinux ssl sysv-utils terminal test vanilla xkb"
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )
+	python? ( ${PYTHON_REQUIRED_USE} )"
 
 MINKV="3.8"
 
@@ -101,7 +103,7 @@ DEPEND="${COMMON_DEPEND}
 	test? ( >=sys-apps/dbus-1.6.8-r1:0 )"
 
 if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
-	DEPEND="${DEPEND}
+	DEPEND+="
 		app-text/docbook-xml-dtd:4.2
 		app-text/docbook-xml-dtd:4.5
 		app-text/docbook-xsl-stylesheets
@@ -109,6 +111,11 @@ if [[ -n ${AUTOTOOLS_AUTORECONF} ]]; then
 		>=dev-libs/libgcrypt-1.4.5:0"
 fi
 
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+=" ${PYTHON_DEPS}"
+	REQUIRED_USE+=" ${PYTHON_REQUIRED_USE}"
+fi
+
 pkg_pretend() {
 	local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
 		~DEVPTS_MULTIPLE_INSTANCES ~DEVTMPFS ~DMIID ~EPOLL ~FANOTIFY ~FHANDLE
@@ -148,13 +155,19 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	use python && python-single-r1_pkg_setup
+	:
 }
 
 src_prepare() {
 	# Bug 463376
 	sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die
 
+	if [[ ${PV} != 9999 ]]; then
+		# Update the timestamp on this to avoid rebuilding it.
+		[[ -e src/libsystemd-terminal/unifont-glyph-array.bin ]] || die "File missing from tarball"
+		touch src/libsystemd-terminal/unifont-glyph-array.bin || die
+	fi
+
 	autotools-utils_src_prepare
 }
 
@@ -164,6 +177,10 @@ src_configure() {
 	# Fix systems broken by bug #509454.
 	[[ ${MY_UDEVDIR} ]] || MY_UDEVDIR=/lib/udev
 
+	if [[ ${PV} == 9999 ]] || use python; then
+		python_setup
+	fi
+
 	multilib-minimal_src_configure
 }
 
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild
index 6111a4e10849..39dedca3bcfa 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.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/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild,v 1.1 2015/05/15 18:12:17 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r2.ebuild,v 1.2 2015/06/26 12:14:41 ago Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="http://arthurdejong.org/nss-pam-ldapd/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="amd64 ~x86"
 IUSE="debug kerberos sasl +pam"
 
 DEPEND="
diff --git a/sys-block/btrace/Manifest b/sys-block/btrace/Manifest
index 1a9729e6e8a7..dd6b9df42272 100644
--- a/sys-block/btrace/Manifest
+++ b/sys-block/btrace/Manifest
@@ -1,4 +1,4 @@
 DIST blktrace-1.0.0.tar.bz2 1592300 SHA256 fb220463f55aaa6ead931991e2f7f6ddae18faaf5bfa65fe42f502a27afa0abf
 DIST blktrace-1.0.1.tar.bz2 292208 SHA256 fdd1481a69f14b916f8d835203c1189ee3076d4a5ff88163b6e6b1f27b087f6d SHA512 7faac50dd04ccc0b782f9d2e8909161e42614a348792af736fac8924680ab9eff6d0db0dea9717a0a468577cc03f8bb1314f4d61cb0f0d92423c000fce89c172 WHIRLPOOL 74559960ae7fd6b0eecc9457221f5133f46bbf23e6e096bc96226c85cee49999ae9cf67a3e8bff66722dca7cd43afaf910ac47dfe1d850f83c63e0db6f0ea70d
-DIST blktrace-1.0.3.tar.bz2 359325 SHA256 221b66a6008a46bc41b8e455cfb1ba924849ce660ac7c7f9dff0fb64c07becb2
+DIST blktrace-1.0.3.tar.bz2 359325 SHA256 221b66a6008a46bc41b8e455cfb1ba924849ce660ac7c7f9dff0fb64c07becb2 SHA512 f20a33b5309146304277a5f8a4c7f2c61e804b2caa5c62d00425ef26fcd1cd628521067b2502d05c368e10d2cd38a98c246030705ba358f835e8a6921444f9a5 WHIRLPOOL 3de4ef8db992e6b6e697b35ae6a2e47b36e5a9157bc6fafc8fc0de206ee15e3e8ceb4dc3bf70c9dfaae16567bbf4c6d8e81f38a3f1619d804b1a680cbfa1ac81
 DIST blktrace-1.1.0.tar.bz2 395445 SHA256 54a2faaa06dd52fd4a56a6aafa2a251990eb8dcf1832bb8c2fb1fc13a74a9295 SHA512 52ed3b66e1ec62c2204d44037d4d13218fd0229ae694493a21f1e83bfc8aeb029edc96b2be83f39cc3e79500abad56cd5a71c8c4e6dd836661777662f3628355 WHIRLPOOL b2777e248533fee8ffe3d92e0311d5797f12f57e188dce94b39e4531b58350ed600a64b50cae590455b52e92b8727c098b56f2c92e58a0567641123201ec9085
diff --git a/sys-block/btrace/btrace-1.0.3.ebuild b/sys-block/btrace/btrace-1.0.3.ebuild
index c63ee83f2a4a..cb513a8d2e76 100644
--- a/sys-block/btrace/btrace-1.0.3.ebuild
+++ b/sys-block/btrace/btrace-1.0.3.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-block/btrace/btrace-1.0.3.ebuild,v 1.2 2014/08/10 20:21:30 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/btrace/btrace-1.0.3.ebuild,v 1.3 2015/06/27 09:48:05 ago Exp $
 
 EAPI=2
 
@@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}"
 SRC_URI="http://brick.kernel.dk/snaps/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 IUSE="doc"
 RDEPEND=""
 # This is a Linux specific app!
diff --git a/sys-boot/os-prober/os-prober-1.65.ebuild b/sys-boot/os-prober/os-prober-1.65.ebuild
index 26df4e8f72eb..4749b969b9d7 100644
--- a/sys-boot/os-prober/os-prober-1.65.ebuild
+++ b/sys-boot/os-prober/os-prober-1.65.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-boot/os-prober/os-prober-1.65.ebuild,v 1.1 2015/03/29 04:51:39 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/os-prober/os-prober-1.65.ebuild,v 1.3 2015/06/28 09:11:43 zlogene Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 S=${WORKDIR}/${PN}
diff --git a/sys-cluster/charm/metadata.xml b/sys-cluster/charm/metadata.xml
index 88b0e3eaf150..21c49dafe746 100644
--- a/sys-cluster/charm/metadata.xml
+++ b/sys-cluster/charm/metadata.xml
@@ -4,6 +4,7 @@
 	<herd>sci</herd>
 	<maintainer>
 		<email>nicolasbock@gentoo.org</email>
+		<name>Nicolas Bock</name>
 	</maintainer>
 	<use>
 		<flag name="ampi">Build implementation of MPI on top of Charm++</flag>
diff --git a/sys-cluster/charmdebug/metadata.xml b/sys-cluster/charmdebug/metadata.xml
index 3cce2d9b9525..6b1c94c9f6e6 100644
--- a/sys-cluster/charmdebug/metadata.xml
+++ b/sys-cluster/charmdebug/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>sci</herd>
 	<maintainer>
 		<email>nicolasbock@gentoo.org</email>
+		<name>Nicolas Bock</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/projections/metadata.xml b/sys-cluster/projections/metadata.xml
index 3cce2d9b9525..6b1c94c9f6e6 100644
--- a/sys-cluster/projections/metadata.xml
+++ b/sys-cluster/projections/metadata.xml
@@ -4,5 +4,6 @@
 	<herd>sci</herd>
 	<maintainer>
 		<email>nicolasbock@gentoo.org</email>
+		<name>Nicolas Bock</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/sys-devel/gettext/gettext-0.19.4.ebuild b/sys-devel/gettext/gettext-0.19.4.ebuild
index 4810b2451aeb..88b8ce87e5ea 100644
--- a/sys-devel/gettext/gettext-0.19.4.ebuild
+++ b/sys-devel/gettext/gettext-0.19.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/gettext/gettext-0.19.4.ebuild,v 1.4 2015/06/25 12:55:25 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.19.4.ebuild,v 1.6 2015/06/28 08:44:11 zlogene Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="acl -cvs doc emacs git java nls +cxx ncurses openmp static-libs elibc_glibc elibc_musl"
 
 # only runtime goes multilib
diff --git a/sys-fs/fuse/fuse-2.9.4.ebuild b/sys-fs/fuse/fuse-2.9.4.ebuild
index 25bc4638c54e..41890065847c 100644
--- a/sys-fs/fuse/fuse-2.9.4.ebuild
+++ b/sys-fs/fuse/fuse-2.9.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-fs/fuse/fuse-2.9.4.ebuild,v 1.6 2015/06/24 07:59:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/fuse/fuse-2.9.4.ebuild,v 1.7 2015/06/28 08:30:45 maekke Exp $
 
 EAPI=5
 inherit eutils libtool linux-info udev toolchain-funcs
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/fuse/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="examples kernel_linux kernel_FreeBSD static-libs"
 
 PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 387a7882eae8..de964128f976 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -2,3 +2,4 @@ DIST 034-0010-module-setup.sh-add-comments.patch.bz2 6424 SHA256 fbcb940c83e362c
 DIST dracut-034.tar.bz2 277692 SHA256 48c7fd57e287d4f34dfff5b5ead14a4511926858f1e2ffaa40b762f257516d7f SHA512 ae06510668e63550d4d6b509b314c7668880387cfe696fc7f21cf04cc488be743440871dbd1fcf4e8314f9aa9e61ee3e78a42a75631123c420767677c6744e34 WHIRLPOOL 0412dea239fbd82d79e873869211ea31b7495dac74d7079e8aa52dd8d2484986fd0a0831aefffe29cfe5acfbf64fa01a9a1fa742192a28276a8671b663a69e13
 DIST dracut-040.tar.xz 263944 SHA256 b6e743353804b46e350177b9ecb9a8511df7e8c4ff9e0b4f3b4f72bc509c98a3 SHA512 6bc6a714572cc18c4cf9f9c1af4bc787287554ead1e39fbec8a1b8986585cf8c7c7ef476f87fc361f565eb344fe2594d63185ffe02cc5fa7cc3eaa03bcb4b72b WHIRLPOOL d8dbdbf6cb7705a0b7793f82a0323c49b4ac0dc3d61cf0073e3061f34af0b5c92dd21a7dc080f2a8d24d3eef3abc99df91f113675721267352f934f1319c66ba
 DIST dracut-041.tar.xz 268288 SHA256 8ece6c2240bf0e9283e5f717b65dfcd6830b3ef7f8d1c01b60014052f1063251 SHA512 358444588febfc482627eb5423b8a87b588ed3842ae814b9f88d8c5dfec28419f2aea92cd54c11c4949b9968d60d7e05ba9cfea78d26d2dc6f2a943a38b28dac WHIRLPOOL ab538fe1ffeb3d43185c6222a6e65af8c684b292be571e0571fdd69011f654c3093f3a2256f3003d5dbaf07d0a26f83d82055885bae1868738ad15dc74982e72
+DIST dracut-043.tar.xz 272744 SHA256 1484b558ed20330125aa04dcccab84da15c5689e19068285aa011f7177889cd1 SHA512 a36271e1ed4c1205a01bece7652095a8bfd722bcf7239a93baeb21e7e0a60fa86dd6657aa69b594241981056c87c6fe9d372f18ac045785122a9cafe8b0c31eb WHIRLPOOL d1efd59e2c41478e489d4707114b141e8bb0501c54209e364edc2060d3ffac7f2e1afd640b0812a452e7fbe7f9134e5e96436f0f1f2a54613d9468f9dca61a0c
diff --git a/sys-kernel/dracut/dracut-043.ebuild b/sys-kernel/dracut/dracut-043.ebuild
new file mode 100644
index 000000000000..a7965e0555ad
--- /dev/null
+++ b/sys-kernel/dracut/dracut-043.ebuild
@@ -0,0 +1,271 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-043.ebuild,v 1.1 2015/06/26 22:27:52 aidecoe Exp $
+
+EAPI=4
+
+inherit bash-completion-r1 eutils linux-info multilib systemd
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="http://dracut.wiki.kernel.org"
+SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug selinux systemd"
+
+RESTRICT="test"
+
+CDEPEND="virtual/udev
+	systemd? ( >=sys-apps/systemd-199 )
+	"
+RDEPEND="${CDEPEND}
+	app-arch/cpio
+	>=app-shells/bash-4.0
+	>sys-apps/kmod-5[tools]
+	|| (
+		>=sys-apps/sysvinit-2.87-r3
+		sys-apps/systemd[sysv-utils]
+		sys-apps/systemd-sysv-utils
+	)
+	>=sys-apps/util-linux-2.21
+
+	debug? ( dev-util/strace )
+	selinux? (
+		sys-libs/libselinux
+		sys-libs/libsepol
+		sec-policy/selinux-dracut
+	)
+	"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	>=dev-libs/libxslt-1.1.26
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75.2
+	virtual/pkgconfig
+	"
+
+DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
+	README.testsuite TODO )
+MY_LIBDIR=/usr/lib
+QA_MULTILIB_PATHS="
+	usr/lib/dracut/dracut-install
+	usr/lib/dracut/skipcpio
+	"
+
+#
+# Helper functions
+#
+
+# Removes module from modules.d.
+# $1 = module name
+# Module name can be specified without number prefix.
+rm_module() {
+	local force m
+	[[ $1 = -f ]] && force=-f
+
+	for m in $@; do
+		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
+			rm ${force} --interactive=never -r "${modules_dir}"/$m
+		else
+			rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
+		fi
+	done
+}
+
+# Grabbed from net-misc/netctl ebuild.
+optfeature() {
+	local desc=$1
+	shift
+	while (( $# )); do
+		if has_version "$1"; then
+			elog "  [I] $1 to ${desc}"
+		else
+			elog "  [ ] $1 to ${desc}"
+		fi
+		shift
+	done
+}
+
+#
+# ebuild functions
+#
+
+src_prepare() {
+	local libdirs="/$(get_libdir) /usr/$(get_libdir)"
+	if [[ ${SYMLINK_LIB} = yes ]]; then
+		# Preserve lib -> lib64 symlinks in initramfs
+		[[ $libdirs =~ /lib\  ]] || libdirs+=" /lib /usr/lib"
+	fi
+	einfo "Setting libdirs to \"${libdirs}\" ..."
+	sed -e "3alibdirs=\"${libdirs}\"" \
+		-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+
+	local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)"
+	einfo "Setting udevdir to ${udevdir}..."
+	sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+
+	if use systemd; then
+		local systemdutildir="$(systemd_get_utildir)"
+		local systemdsystemunitdir="$(systemd_get_unitdir)"
+		local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \
+			--variable=systemdsystemconfdir)"
+		[[ ${systemdsystemconfdir} ]] \
+			|| systemdsystemconfdir=/etc/systemd/system
+		einfo "Setting systemdutildir to ${systemdutildir} and ..."
+		sed -e "5asystemdutildir=\"${systemdutildir}\"" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+		einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..."
+		sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+		einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..."
+		sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+	else
+		local systemdutildir="/lib/systemd"
+		einfo "Setting systemdutildir for standalone udev to" \
+			"${systemdutildir}..."
+		sed -e "5asystemdutildir=\"${systemdutildir}\"" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--libdir=${MY_LIBDIR}"
+	myconf+=" --bashcompletiondir=$(get_bashcompdir)"
+
+	if use systemd; then
+		myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
+	fi
+
+	econf ${myconf}
+}
+
+src_compile() {
+	tc-export CC
+	emake doc install/dracut-install skipcpio/skipcpio
+}
+
+src_install() {
+	default
+
+	local my_libdir="${MY_LIBDIR}"
+	local dracutlibdir="${my_libdir#/}/dracut"
+
+	echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"
+
+	insinto "${dracutlibdir}/dracut.conf.d/"
+	newins dracut.conf.d/gentoo.conf.example gentoo.conf
+
+	insinto /etc/logrotate.d
+	newins dracut.logrotate dracut
+
+	dodir /var/lib/dracut/overlay
+
+	dohtml dracut.html
+
+	if ! use systemd; then
+		# Scripts in kernel/install.d are systemd-specific
+		rm -r "${D%/}/${my_libdir}/kernel" || die
+	fi
+
+	#
+	# Modules
+	#
+	local module
+	modules_dir="${D%/}/${dracutlibdir}/modules.d"
+
+	use debug || rm_module 95debug
+	use selinux || rm_module 98selinux
+
+	if use systemd; then
+		# With systemd following modules do not make sense
+		rm_module 96securityfs 97masterkey 98integrity
+	else
+		rm_module 00systemd 98dracut-systemd
+		# Without systemd following modules do not make sense
+		rm_module 00systemd-bootchart 01systemd-initrd 02systemd-networkd
+	fi
+
+	# Remove modules which won't work for sure
+	rm_module 95fcoe # no tools
+	# fips module depends on masked app-crypt/hmaccalc
+	rm_module 01fips 02fips-aesni
+}
+
+pkg_postinst() {
+	if linux-info_get_any_version && linux_config_src_exists; then
+		ewarn ""
+		ewarn "If the following test report contains a missing kernel"
+		ewarn "configuration option, you should reconfigure and rebuild your"
+		ewarn "kernel before booting image generated with this Dracut version."
+		ewarn ""
+
+		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
+
+		# Kernel configuration options descriptions:
+		local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
+		local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
+"(initramfs/initrd) support"
+
+		local opt desc
+
+		# Generate ERROR_* variables for check_extra_config.
+		for opt in ${CONFIG_CHECK}; do
+			opt=${opt#\~}
+			desc=desc_${opt}
+			eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
+				"is missing and REQUIRED'"
+		done
+
+		check_extra_config
+		echo
+	else
+		ewarn ""
+		ewarn "Your kernel configuration couldn't be checked.  Do you have"
+		ewarn "/usr/src/linux/.config file there?  Please check manually if"
+		ewarn "following options are enabled:"
+		ewarn ""
+		ewarn "  CONFIG_BLK_DEV_INITRD"
+		ewarn "  CONFIG_DEVTMPFS"
+		ewarn ""
+	fi
+
+	elog "To get additional features, a number of optional runtime"
+	elog "dependencies may be installed:"
+	elog ""
+	optfeature "Networking support"  net-misc/curl "net-misc/dhcp[client]" \
+		sys-apps/iproute2
+	optfeature \
+		"Measure performance of the boot process for later visualisation" \
+		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
+	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
+	optfeature "Load kernel modules and drop this privilege for real init" \
+		sys-libs/libcap
+	optfeature "Support CIFS" net-fs/cifs-utils
+	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
+		"sys-fs/cryptsetup[-static-libs]"
+	optfeature "Support for GPG-encrypted keys for crypt module" \
+		app-crypt/gnupg
+	optfeature \
+		"Allows use of dash instead of default bash (on your own risk)" \
+		app-shells/dash
+	optfeature "Framebuffer splash (media-gfx/splashutils)" \
+		media-gfx/splashutils
+	optfeature "Support iSCSI" sys-block/open-iscsi
+	optfeature "Support Logical Volume Manager" sys-fs/lvm2
+	optfeature "Support MD devices, also known as software RAID devices" \
+		sys-fs/mdadm
+	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
+	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
+	optfeature "Support network block devices" sys-block/nbd
+	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
+	optfeature \
+		"Install ssh and scp along with config files and specified keys" \
+		net-misc/openssh
+	optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
+		app-admin/rsyslog
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 1e0df5734cce..f842f64a7e17 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -62,6 +62,9 @@ DIST genpatches-4.0-8.extras.tar.xz 16280 SHA256 ea2a886f46e800b321b14168bb1b28b
 DIST genpatches-4.1-1.base.tar.xz 4068 SHA256 4c47329cb177183a87430775a57ca9069beb05581c56546c508aa3c14d137727 SHA512 e431366509b81fabe746acaa3b7deb34d0612a318a0c83fd070b5ed9a0619648b2965b99901d21ec7ba053b8376354327b0f0d02d8ae346996ddf29466c168eb WHIRLPOOL 2049e567f8409d9213e9de78d3e8c0dd62c1f11691c99fd82d494bec22dc8d85f357b9d789885d8bda178ed844ac25a255148d86fe1827ed81542bc0f8754074
 DIST genpatches-4.1-1.experimental.tar.xz 4908 SHA256 86eb0ef2e651afe7d223e28f667fe1b297ef958d4bc29d0ef5cb48be32d6b9a3 SHA512 3d02fb02a50ab5f1a339bafcf3dec03ef91e6122b72169ea17a6c3225b486e4789ef35c4828fc8f65d06ae25b6899f3e4d107f9356e5844b2933f49dfe0f74c7 WHIRLPOOL 96dbe7bedd49e7fc27bb6a6048f7bffc91c9fed9c278c3db8556af974c1d090d116833007b7d6a6b7e5cc56c280bfdd03d15a1515d7e3fb123bbe85ed0323e99
 DIST genpatches-4.1-1.extras.tar.xz 16172 SHA256 7be8e1ef45089a572112cb9a1d15afea8dd0d7e75b231d9af7499533f9410bd1 SHA512 f9f3ccd746e321fa2da75b15caf0ef67e8485835503ffaa82d68f85cc7bf931ccb8420695cdb73b0831451a4c550430b73c1d0ee1dab16eea32ba038c09e452e WHIRLPOOL 123f9960272e963cce8baea04233943012c408e3ac3b915605bffa5bf3f4c833c9854020c84c60bed50a4867ea72cafdc58cd13bac3af86e0ef51d0581fdf90f
+DIST genpatches-4.1-3.base.tar.xz 4096 SHA256 d7dfb397945d8f0b505b0759dc7db39784568f8eabdd56549070569ec34c31a9 SHA512 6b7954af6dbc38a7655ea9f50f72f4024c634b8d0df88e780ec8079058ca5b7450dde66fe7ba6ebdbd22859f22647d47fa2033d4adc9ff65d598addfa36e6a7f WHIRLPOOL 73c781f414141d772d1e6bae52d213bff60971f0e7e9f6b931776ec63eeb68bffd812ac87018bb6f3bb9c9ec3c92b8ffae67141c146c05b391a967d587f3b7fa
+DIST genpatches-4.1-3.experimental.tar.xz 157844 SHA256 03e93741fb653f28ca103c058f807e8f0f8bbfef8796863685c47af104e72e01 SHA512 c6cc02058130b911277333ac5d06e1e3ad5e8e22d51d1ab7eade7871599736fecdc7888d5b6e5932bc07ff6f841bd5a62d1ebc4641ad558f877644a07f070689 WHIRLPOOL 58a119f070f595b457f87c88bb5e15adfcc499c0dc8027506fbdea9c07981dc8553f7ec372500574c87331be50fa230d89ad4f82a478be148bc873a844677cff
+DIST genpatches-4.1-3.extras.tar.xz 16176 SHA256 f29b92fa9e7f3c3a1081b86227b9daec3d932610f2c6a4d8ecd8218dcda190d7 SHA512 b1e61b9fe7303752643cfed0717c74fe953855bf2f2d019ff95d83f08a5e4f9b00ce5a8cf72d48fa6716abcec3a8476b003cf6c6b25a04b6b47a8505faca182e WHIRLPOOL b3797a12878a55331740c55f483f6ec69e6180a52dc3dbc227b3c68bfefcbeccc702cbafce3d6e3b0ce09d82f43d91b4bdd0d8ae51f6edaefcc6dc1d6d21987b
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.1.0-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.1.0-r1.ebuild
new file mode 100644
index 000000000000..b8140d6877c5
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.1.0-r1.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/sys-kernel/gentoo-sources/gentoo-sources-4.1.0-r1.ebuild,v 1.1 2015/06/27 23:01:31 mpagano Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="3"
+K_DEBLOB_AVAILABLE="1"
+K_KDBUS_AVAILABLE="1"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches"
+IUSE="deblob experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/metadata.xml b/sys-kernel/gentoo-sources/metadata.xml
index a6bd00fc620f..c824b6bc9018 100644
--- a/sys-kernel/gentoo-sources/metadata.xml
+++ b/sys-kernel/gentoo-sources/metadata.xml
@@ -5,6 +5,7 @@
 <use>
   <flag name='deblob'>Remove binary blobs from kernel sources to provide libre license compliance.</flag>
   <flag name='experimental'>Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".</flag>
+  <flag name='kdbus'>Apply the kdbus patch. This also requires the "experimental" use flag.</flag>
 </use>
 <upstream>
   <remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index bf803d9474bf..35a41174d265 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -20,18 +20,18 @@ DIST hardened-patches-3.14.35-1.extras.tar.bz2 869361 SHA256 c743b5951d086805672
 DIST hardened-patches-3.14.43-4.extras.tar.bz2 969523 SHA256 4aa9b820a1e302df33dfba574e609fe8ccd25143054124bcb7bb06ea19ca9f59 SHA512 52cf7cb51bec66d6732f391c2413a5ae7e748f1c4eea346737b885b4e1d937b0d8b5a0ce7cc0959526b774304f2372341bc4c2be583e77f854cc897c1bfb2480 WHIRLPOOL 8d7b1e965acfc68ae8b4d0d19168a1317ae0a0e4a1a75735ee9d54a356b3410312908ae83488cf1ddab238a5f63e5f36c7e286713b28e8ff820bf933b4b2904e
 DIST hardened-patches-3.14.43-5.extras.tar.bz2 971139 SHA256 fb4d6cd15264530eaed464759a795b0d3103f90a3cd173006072f61333ec8981 SHA512 488f46e1fbdb235b88711d78b9a10c503491ffa2949bff716cfe55f8e34a5db8e6f9ccd1a5e38a68d5d9e73bb2fc0e823a6dd18f9c13a562fd4b0887d2bd7cee WHIRLPOOL 4426e9c985f77a6a2c43b066d0ea1e313190a6cf5f1bf136ccb8bd82191be750a0f0b06e0a061824133d5c98c3dbb9bc3eb7d50108d66600765493ff1f4f5e61
 DIST hardened-patches-3.14.44-1.extras.tar.bz2 971301 SHA256 1f12897747dad88fdbcaff21d078a86feba7b5b9f71651b0e49307b9a6d8c8eb SHA512 cd795006c559d95d7a8b7c67620b10f7882c8c552b25d9ad1b029f3f4da60771c680ecf038a32c137748047b405e01cf70935e3664364875fbc04bd36ee2d344 WHIRLPOOL 809990cc9612531eef4d502365cd7c5de81a4b298c53261bdc321f7f7622b830f26b8e3edc23c1336df7d40fd2a36e19428efb240306a299a4190b1771497fbe
-DIST hardened-patches-3.14.45-1.extras.tar.bz2 972543 SHA256 aa1fdfb4eb584774bad12643ed6d3010387e3b04ce36984c0e3d63d82b2b281f SHA512 cefd75623e55940920651149b050a15a354dc38fe2388bc5f28cc19d51e096c5c4d84cf0d7111f6f3fedeb5bb9a65217e7355f11bcfdbb96edc15dc27d3f7577 WHIRLPOOL cf327432437d671d5308283378ac9eb10e604ba5d3cc38b0e4955e4ce64ad9c572aad46ed3f75e622cbc212aa46468f5e4f38abea0bc745ce65728addafb3a31
+DIST hardened-patches-3.14.45-2.extras.tar.bz2 973435 SHA256 15d87e3dfe5d0eb24e7c403bf771387835ec1ad52ce2c8ca3a4738c602dc1ec4 SHA512 b60018bc3f0e78800e01d12bc8d5e4b0e2fec8094db6ab384c90dddba57548f5468cb3284c7746cb3a2a90e0eef553ad219dd073eccd841ef757db796a59bb97 WHIRLPOOL 6b2e08f0389e1caa10fcbf31026500bedcfd87be09914bf57bffcce6ad74cf2247370e089c7b62c49494be7640199927837784b4335cb4d3212bf72889c9e297
 DIST hardened-patches-3.18.9-1.extras.tar.bz2 896609 SHA256 8b587954838d063a97491cb0bd56bb82db1898f5a10b5a142a0b9175cec67610 SHA512 d24f4080ba0437939c296614659477aa3d535cb3f3c950cc2a695c3925c8a04cab543b1277e48ba05a6e58cd31762473ad5d2b54e9c5aaf5b1a1b46965a7166e WHIRLPOOL 73abf5b3c1c6b868b931357d11707b41a6d4bee8fd5e2d8306ee3830a0edd24f371159b8f8efbd2b1afbc21efb045e96b2994219d43ee7ab484116e86e136196
 DIST hardened-patches-3.2.68-1.extras.tar.bz2 2221390 SHA256 783fe31d10548f0d6e24c8613e97a63d7c35f4ba407239990ffdaf8ced9ba855 SHA512 3d232742b71c86359aed8f28198f9af0bc800197aed0ff5a14953dab0fdb0ce320a77d442f2109fbe3185512be3c7e12b4e3efe8cb432bfc3da4d7573e6a4197 WHIRLPOOL a4d495b49ef6c94d3290079b6c9209a82872ae24ba7405c57a2a8d5ac3a659d8cb388770491ff0666446134a75bb064917eee71d54a4d3ee35de4a0df7fc0e82
 DIST hardened-patches-3.2.69-5.extras.tar.bz2 2288972 SHA256 34714276b7f676a6e8318419b9e01af1064442da70bc1b28d349f8c0d7efc951 SHA512 02ba31182d16588ecf503abd37a34675e1b6e35ceed5653a15bd63f2ee4f38946c6c6603e9428d2a4d3d0d186b954d20f7a5e75f0feea952c76ab8f9739ad635 WHIRLPOOL a708cfb3c4a764f2399c21a9380ac278b65d0280c8b05118c8ecf99a937e91a84e89c40f273f486da6e04aefcac737ee8f4b412418845237f65c2774ba24baf4
 DIST hardened-patches-3.2.69-6.extras.tar.bz2 2294314 SHA256 ebeaa2f7ee25ef52cc93bb9df8d7ab92ddad661355df8e9afc6b9372c9922647 SHA512 1ea1dd68f2e66a28f24200615f6fcfa5b7ba15cb0e9f4afde3d89116eb6e3d988470c658c5a3fc38db2eb9ae58116274aceb047bf289a132a30946de858b8bb3 WHIRLPOOL 9266b0b78773700f921e7ef62b5e7eefb800c04a446a8e3a0866143194cf89ba2f0a3cb4d91a0ef2d59135a49c2a249a266e9f6887f085700dc6e0f6cda40250
 DIST hardened-patches-3.2.69-7.extras.tar.bz2 2295730 SHA256 b06a706691e77b45ce8f6d0e9380eed4b89c04985d504f4411868a84f96c5100 SHA512 0fcfdeccb4ca592f84531780883fc2fc691e65dd7d77e00827898bee0c24ae0aa80670b9fd7d982ca198768907cc7ae0e33cb1823d20c70e83812969760df5ab WHIRLPOOL a69d1e144195950735e0f10a02e1442edabb6e9986f46ee9a3ffdf9faa1d55f7fe362e71eede6ab9d43c9e1e0b462ee156ea6a34a3ab34c609a104c5243b8521
-DIST hardened-patches-3.2.69-8.extras.tar.bz2 2276339 SHA256 f640131a7d869599ee8bf175ec1138e80e1203cc3c3e9a6a8169bf0a5315ea69 SHA512 e51f89174fc0806676a133746a77a99cfa0a7fb8ee756db33b297caff25197c443cf1e8a466daa424ecc5612aa9200cb070acd291bcdf7c704799cd6dc6ce5ed WHIRLPOOL 7dca5a8470c80adf869896ec9e4860d5c69cc7860f909764133647adc6f14c6bec4cc6c42312e1c70dac09544f8207e454f7a7df0168105a471f95537ef49e07
+DIST hardened-patches-3.2.69-9.extras.tar.bz2 2288374 SHA256 0a635549b1a0b1e5cd85d19eeff9f1469cba6c3de06652154764f0663ee88081 SHA512 420991631a0e62b1be14e7e2c4ab5c3dc4f972efdb7b41ba13c030c33ce3a34dd09d68a22839f9f335ca446254a0a326ca30e89a1f321d442f140fcff927317d WHIRLPOOL c13354867e9641086ef2c8388e8b5a2bd37709ce7d24833afd28bf3c8e8589deecbfeceb3abfdb8911b124cebfd521fefdc3c70e684d2ddb6603a7f6f4f130d6
 DIST hardened-patches-4.0.4-4.extras.tar.bz2 1344457 SHA256 0c88e72e6bff4497c3fc7aa18859856df3f2f5588e50eb70a5fb94ea49fe2466 SHA512 055830db657b9ecfca9835e75fdf2f0c0fb8688a7fa845e97d29415ec5b459ab1b14b5e90758ef6393e98473839634181935f2caf14f9e619e74fe72e562a73c WHIRLPOOL d5cf0e7c16abe1a3364c78e2a23a92facd119259c6fd600b4b24105966b9d494ddbacaab3cc40c519e1c4196571fa030724bc6838007e3622b220fc18b92ce78
 DIST hardened-patches-4.0.4-5.extras.tar.bz2 1346268 SHA256 d3dca3da3fde50bc5418738d357a65b17573c1f2a4ed5c321e16218680899cb0 SHA512 22c1b2d166b040a718934f70a705458fdcccfb6c4d996ff55b51a47ecb91f4fd2bbb189ebd978c5fdfa7dd7644a88d99e85a6ce679a07b35431823aad2c53440 WHIRLPOOL afe372d1d193c85930abb1ac94ab31569bd5d4c4c4609a30db1793d71dcfa3170e9f8269c77cac4c73018213eedb2d211891ee6f63c14c1ab5bc86ecb48f67f5
 DIST hardened-patches-4.0.5-1.extras.tar.bz2 1345095 SHA256 2107abb80b71077aecdf91817f71851b37b8bb8183a7c1a5a196de8dd5391d4e SHA512 213e21e3aca6fa9f31a370771f41e901070ac526e87828169fe8149925f0f184a85b1e7458e13e4097e74c7435f18273ca340f5a2ab43b3c7ee4c6d79f81e570 WHIRLPOOL 7191e6bff976084457fd19ca59c300ca4040f04918abd09b7b50732c103d20f50fb6247029e1a6d24dcabaaa1b9947a5dfbb91286c60f89fa610778a2ae63483
 DIST hardened-patches-4.0.5-2.extras.tar.bz2 1344986 SHA256 46064c63a74d0581d9f687ffb92939a6a2a50661ad333d2270a51fa259caa41e SHA512 993491e71c85c14ff7af531557d5398e093bbaa8800c589751d91a6096bb43a6254345c8e497886f3c3ab0a62dedf0f7c7d675d88d853a8e9ae7e07a5b9710e0 WHIRLPOOL 552bbe19aa0eeef2523457205e13b54cf16d686bc0707b3ecb88a390c1c9a24dff934b4d00fbb483fddf926a4c152c4960a1f6c8329efb71c5c0d63f1a02636f
-DIST hardened-patches-4.0.6-1.extras.tar.bz2 1346803 SHA256 a13341cc52b1146b3f7080ede8c429caa72d25b4b400652f3a892a15e31abc68 SHA512 403e0bf791dd9451512a86acd0ee4af07d0acd725cfa8dac7bb34ef71bac621d23813d805dfc34db42f4c80748f8997a878302a4cb1dd7fda0fbd60da44ed2b5 WHIRLPOOL d35d5212df81c0ca3dfe9a346a6578fdb8d8ccc92381b0cf4830aa023680aa3cb1bb2b08e8da4b022c63ed3646842c60f0a268bbe2e1d85f147895dc39cafaf7
+DIST hardened-patches-4.0.6-2.extras.tar.bz2 1347303 SHA256 635c4f4f59e0042e79f94669c454fbe7fc6f4cd1136891934beffc35143c55dd SHA512 480e67594b5239852b764afc2e2d7065cdd95afc3cf5074a6d533f74ffa03079183f83901269d9ebfaabe17c18374cbec4677542d8fa9866b81a2bd56783faae WHIRLPOOL 5390ad81c3fadb7744fe3f62efea3dacec952ebd36d70fbed5c6d746dc98ac039d0da765d9547667b48158f50250d690ca0f3fb9f64644c5421452eccc34b071
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
 DIST linux-3.18.tar.xz 80934708 SHA256 becc413cc9e6d7f5cc52a3ce66d65c3725bc1d1cc1001f4ce6c32b69eb188cbd SHA512 2f0b72466e9bc538a675738aa416573d41bbbd7e3e2ffd5b5b127afde609ebc278cec5a3c37e73479607e957c13f1b4ed9782a3795e0dcc2cf8e550228594009 WHIRLPOOL 81634af631b7d30ccd1f4798f96f44d9aa0ba6609b73f2747eb6aebaf7a99487fb2dbd45767605186182533cb222bfd9236e8dd5e11a04fdb67c211e4e0a91d6
 DIST linux-3.2.tar.xz 65065516 SHA256 dd96ed02b53fb5d57762e4b1f573460909de472ca588f81ec6660e4a172e7ba7 SHA512 77e9a52d78d6c8e951df1e166023eebe5defc5ef3c45d3ac84b613137b3c2e55cee5693d828ebd06c5034bd89ea2a5f862f55824f2b7839c9ad7212c81e3ecb0 WHIRLPOOL 7cc68baac4441740e2171fbbc4195ee6c0351de099aadaee8cb3487f6d1f8b7e1d3144ee54ba38dbd24d6be431a1ea3b921ffce82ff84df21a98da7bc61c1d17
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.14.45.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.14.45-r1.ebuild
similarity index 91%
rename from sys-kernel/hardened-sources/hardened-sources-3.14.45.ebuild
rename to sys-kernel/hardened-sources/hardened-sources-3.14.45-r1.ebuild
index ec764b5df810..4b9b770c3c89 100644
--- a/sys-kernel/hardened-sources/hardened-sources-3.14.45.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-3.14.45-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-kernel/hardened-sources/hardened-sources-3.14.45.ebuild,v 1.1 2015/06/26 00:03:48 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.14.45-r1.ebuild,v 1.1 2015/06/28 01:46:06 blueness Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ K_DEBLOB_AVAILABLE="1"
 inherit kernel-2
 detect_version
 
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
 HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
 SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
 
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.2.69-r7.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.2.69-r8.ebuild
similarity index 92%
rename from sys-kernel/hardened-sources/hardened-sources-3.2.69-r7.ebuild
rename to sys-kernel/hardened-sources/hardened-sources-3.2.69-r8.ebuild
index 483af1e37f9f..096c4af7998b 100644
--- a/sys-kernel/hardened-sources/hardened-sources-3.2.69-r7.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-3.2.69-r8.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/hardened-sources/hardened-sources-3.2.69-r7.ebuild,v 1.1 2015/06/26 00:01:49 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.2.69-r8.ebuild,v 1.1 2015/06/28 01:43:54 blueness Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ K_DEBLOB_AVAILABLE="1"
 inherit kernel-2
 detect_version
 
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-8"
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-9"
 HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
 SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
 
diff --git a/sys-kernel/hardened-sources/hardened-sources-4.0.6.ebuild b/sys-kernel/hardened-sources/hardened-sources-4.0.6-r1.ebuild
similarity index 91%
rename from sys-kernel/hardened-sources/hardened-sources-4.0.6.ebuild
rename to sys-kernel/hardened-sources/hardened-sources-4.0.6-r1.ebuild
index 533165b62e8a..86a9dfba87c1 100644
--- a/sys-kernel/hardened-sources/hardened-sources-4.0.6.ebuild
+++ b/sys-kernel/hardened-sources/hardened-sources-4.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/sys-kernel/hardened-sources/hardened-sources-4.0.6.ebuild,v 1.1 2015/06/26 00:05:45 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-4.0.6-r1.ebuild,v 1.1 2015/06/28 01:48:01 blueness Exp $
 
 EAPI="5"
 
@@ -12,7 +12,7 @@ K_DEBLOB_AVAILABLE="1"
 inherit kernel-2
 detect_version
 
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
+HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-2"
 HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
 SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
 
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.32.108.5.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.32.108.5.ebuild
index 0df0cc6f1bc5..bf69a5a4ea96 100644
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.32.108.5.ebuild
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.32.108.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/sys-kernel/openvz-sources/openvz-sources-2.6.32.108.5.ebuild,v 1.1 2015/06/25 12:45:32 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.32.108.5.ebuild,v 1.3 2015/06/28 09:59:18 zlogene Exp $
 
 EAPI="5"
 
@@ -31,7 +31,7 @@ K_DEBLOB_AVAILABLE=0
 inherit kernel-2
 #detect_version
 
-KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc64 ~sparc x86"
 IUSE=""
 
 DESCRIPTION="Kernel sources with OpenVZ patchset"
diff --git a/sys-kernel/tuxonice-sources/Manifest b/sys-kernel/tuxonice-sources/Manifest
index 0d200bc74f9a..a3e33934f1e3 100644
--- a/sys-kernel/tuxonice-sources/Manifest
+++ b/sys-kernel/tuxonice-sources/Manifest
@@ -4,18 +4,30 @@ DIST genpatches-3.10-85.extras.tar.xz 17848 SHA256 bda353f5a0ca2da6d47e2389ede23
 DIST genpatches-3.10-86.base.tar.xz 1212180 SHA256 d7302d69ffd2fdb69743d955e418b91f6f7bcfc6555100e3eccbf8383cf40764 SHA512 8b5255a6012a157ef386715c7a2c6a0171e8f79169e4f00a75c8e149392ad29f894e9164816dcd779bff61dcdb0600053cf0e7c6cbf75bf9b241cd4acbbf868e WHIRLPOOL 2658e4031649b0d7ebe6d6a8dc38f5d36b9a8eb20066f9ca89193537ec21cf069c66b0b75b76d82933d8fab8c6393f374ded2bbc8a278bc477a12ffe0c4dcfe3
 DIST genpatches-3.10-86.experimental.tar.xz 60176 SHA256 5c92a211ce6823083304d74da99b8bb2fd1aa47d48a1be9e1d7af9e4fb2fb29f SHA512 cb06ac8d24aaf7f2165ec1c2cce3736b0108c3e3e340bd3914c79d74825c8ae51b5ae4557324189e9d7385c864620d6717a6846dc9ba1452c98cc33b96a620e7 WHIRLPOOL a3c689b3506267e4be31d4c6ec0bca5b164e6afbc0e041d2ec8fdcdefca919c79c28074bb289719a09660f3f8cbe884be4428b9ff325f4d3e24fdb3d3686b746
 DIST genpatches-3.10-86.extras.tar.xz 17840 SHA256 7bfaf11431408241bcad1cca9831cbddc61ac50cdf850f5ab70ad0534c9257ca SHA512 a645ec5311b12aacd377ea42d1ece9e55040c34b9d8decd8d597d2850d23260a7f53c5f5402079a38355e9cade4d2b19d38dac792bc8f587268076ca82ea2ce5 WHIRLPOOL 551b5ca718387a0a002db9284bc8897846db87a63baa8e33c9ae203ddf3704e15062d014a87ee80193bbd4e5de2947a34bc61c9c4f11e49ffebba55860d87726
+DIST genpatches-3.10-87.base.tar.xz 1216464 SHA256 6df879900788a42efe3f88873af4c0b5017f469634f94802f41244f696706d98 SHA512 6ad4fea3203e3fdaf5b491ccc4ef30a74ea019fccb953f4bc67bd78267858f610c1d6ef4651c77f6f1174daba6ff4acb8fdd6cb7d4ef6554a3c127cacbdb0ccc WHIRLPOOL faf62faf482827f142fd1477ef27e2aa4f67d519d60a785f5b25d2aa7f24478ac5dcb26be3a97bce627b6f09078920f4dbe31edc62cacee20bf321d65faf2935
+DIST genpatches-3.10-87.experimental.tar.xz 60188 SHA256 d779f799a398f07377f1d7cc140b3f07b43b3afdb13f94c8ef4366ba47c9f78c SHA512 abd1d1d6b4fa175c8a0e70bd57690f674e8b588e22ed18459e5433e9065336b165e404eb320dfd3e62b78978a9961c2f011aa9d758f9bdbe27b87ef008210a11 WHIRLPOOL 1667a6d965a315b7bc2b31f6d6fbad65c8c3bb66ce978c97562ad8255815eaee2b895a5bd5a8a8dbe0505e29763b8553a70ae10c7d75d853bd2af97ea3b957aa
+DIST genpatches-3.10-87.extras.tar.xz 17844 SHA256 3caee8fd80d824dbe855f52524a70c8911baf8996626eb48b82391956f39c58b SHA512 7fdd240c093e1837816358f98328cbeffdbafde8f3dedd9f31dee39d4f491cc3764dbdb30549477eb820e16ace063d6958d6fe487f4b184b96f6799ed959b95f WHIRLPOOL 9ab75dde01eb128f586d192d70cc308353f1a2cda67d949af6d955c2bbd34c4b09b0e8e1cc1c1909daca6b0006d706380806d209ba8baa4422b8edb107355778
 DIST genpatches-3.12-42.base.tar.xz 1340680 SHA256 167429c561b25408c0ff278b7a8a07b3670368cb3ef3d1dd00cb5649e6af4f5d SHA512 b1e718ab1d08fb453a4bc87a99afff7508e31e1e94500dff90cb644c5504887f1b7edfdf6867ce3b1d558c5ecfa909997d99902d3ae01080a98503bebc3ab8b0 WHIRLPOOL f92eda31b056007ba3861772ba1031d52d2b5d01d6979abf778340860679406126e05d562d5dd6c4e5897314e309946e759c203bd403c2a0dad0da77887aa3af
 DIST genpatches-3.12-42.experimental.tar.xz 46544 SHA256 bbd415e45d263de4e0aec525267225bc1ff86e58a02c329b819080791325ae71 SHA512 fd8cc4029568fa1fd1aa277445810a230dfb47b287dacd0454fa9ae852ab3e1d88ff6ad73ff6bcf4cb60af98edd0424af601604029953da762bbafa328801bde WHIRLPOOL 94b118c734f5b3f51feb9e66fd9fa46db36670dee644a58bb9c74b46a077e1f57cf3b7bbc6c2cc1da6f7d76e051cb2f9936ef624a41ca06036a5d5a4a9213822
 DIST genpatches-3.12-42.extras.tar.xz 18232 SHA256 338ed3d02df7cb8fa3dcda8c57650d2f7fed78a9df6db09fc1f9f251d99d53b6 SHA512 4b00f9c2d64c3ddfe189b2964678ad03c27da7e85182b68281f93052a90a871119a1ad08b059c947e7178df5343851176ac5d6cf6df7e94ad3c4f14e64617a45 WHIRLPOOL 6fae32b81f6e6535e84cf8d9081b0f3a23b1fcd85359e852ab43524386c34b7518d9b68401d8f93b8063839ed5d909888f17089636f4415bd7cf0c1a4a69708d
+DIST genpatches-3.12-43.base.tar.xz 1364580 SHA256 2d83b0b0ed5946542676467d99d9d0f0879c8da9ab16a9b602548bc3fa9b5fbd SHA512 40d77097db66868b0281c556e25edf24924a8ea4dc6b0a297f38730f41e55a9b4937bc68c614d2279875e78bff0c9dff2a6c4192fc2a847ac3b1d3927af25acc WHIRLPOOL 34ef24dca012870ff9129113147457fdbb5009bccc2ea4dbb0f601bb88b36fbf037c2d12c646c3ac38e7413278e1ae316bc2a1fdbbecdbc8255bb32a8dac3ed2
+DIST genpatches-3.12-43.experimental.tar.xz 46536 SHA256 a66c108185ec4524e212f273c01b1d3dc84da9e15e08f570be0da899067ce567 SHA512 1d739c625e13b1c48554746572d0e2f2bb141a2d9742a683ff342a770792fbd8a1764d322c987a8a0f091c5a0834f7f980f4e2676b34bff05bd2b7a2ddf36373 WHIRLPOOL 3e9601ef0e9903fff4b363564f8e300becc78f82337ed84effa806dd1067de3359ba21596af782d2292e5979445e74a885c456df61306ed2cc8da008008a3be1
+DIST genpatches-3.12-43.extras.tar.xz 18236 SHA256 928d2d472b3fcedc711b2134de4294a9a8906eff3344baa26bc9ef276067a180 SHA512 6096d64e1d8f88fd4570c50d7f04265173dc136feab79477549d1ccea6d99226c756e195a2a1fd5cd245888566ef8b005f3fd40e83076e0c83b1b8d5edba8b26 WHIRLPOOL aa44f5b80524a6dce660f0d13513d0d01dcb0a23f3c0e9cd6d110c989aa0e7cfaf77d02d1034838bf02b666d7b608a54fee956141d7b2527590381d0ac40dc25
 DIST genpatches-3.14-49.base.tar.xz 959560 SHA256 671097dec0eac493698a4bf773e96d2bfb6f5d460642f49f0117da2cb76e51b3 SHA512 2fb24dee399e2e574f19e1b0e88f7ce397101ed34236403a5c1e47a272f89e7bfbb399c136d4d53e8211f865c757b55402a76ef5678a8e5f6ceedced5dad2c62 WHIRLPOOL 050716ff15a0a844bde931cbd9b5110e25686b1adbcf2bb4b9ca88d37b3783957450fdb31c2087591a14f22fcd91f4f2008a417c86802948f44a76c8851c21f3
 DIST genpatches-3.14-49.experimental.tar.xz 60320 SHA256 b426e25bb590b05f6cbec429b348702c402166d3c02395975aa26c4b32f581c4 SHA512 01efc1a84c843d27e8b5d8054ccff00aeb38c5607c20973244ba5433c50d3b0268c0182ba566c2849ca052ce29c68e46234a86ea61d67fcc35a89c886bd0d0f7 WHIRLPOOL 79c488fcda43e8387a54fb681fe572f80f57a7d8c6beb9154ab958a28fe5a754092cff2131d4130a9e8f203fe69695771e95102e178e1c4e1871b8aa03c4062a
 DIST genpatches-3.14-49.extras.tar.xz 18264 SHA256 ea0ef08a4131dbd362df849d72ad19f6c28ce0ca7e2de92e30f9769f6ca34a62 SHA512 3e35ba7f3543a9b3e8fcfb8217291f3fc4ed731260c5cdc925e382ff58cca4b76f620a6303c65ff4a757f08d80ffc5458b5d30e41fde8449fbf2c6c180c82536 WHIRLPOOL 7925c977e302521b3db319106caa430b7b7113dfe09a6e7db6ffbc2fef95e57897eb1453ce5a23213c1ddf94f8456abd6986ae2735b71ad0fcccf717de5cc294
 DIST genpatches-3.14-50.base.tar.xz 971352 SHA256 e3aefffbe04e6b7095c5595955d128bd9cd6638ab4528aeaec15a39b9509930a SHA512 5c91dc715b54df67bc6c676ee86d00c42ffff50b90776ae0d54d5ede3ab6bc57740bb9a87695bd91fe83647289c6ce2c3c35f7ca7608d1c2434894ba2be5a8c4 WHIRLPOOL 6afbbbcd8817942d363fea8290b764f6c876ac5ba5407e78d9db3728a16701f588fe100182119928ee8378b6a4e191895afbe4ceb1742d37887b37dfd7a5ae5e
 DIST genpatches-3.14-50.experimental.tar.xz 60308 SHA256 5cac1fb6cbcc1ee3a223037e5588d4c9f1b1d3c0b01d023602f115aeeca220d9 SHA512 e9ca9a5606b3911c554c3971493c1d19b2ace10bc65250205942fb3749bf6c09548000f0557e66c6fb2512ee117f6d09a923def14e325c8a68dd85fb368fa0ff WHIRLPOOL 6e9054fede3167d5e805a52f4f906572f8b64072dc642e9f335ed503cd86724226c7e8d072420baaadc211de17cacce1c263d4be878f035e1ba047add880cf43
 DIST genpatches-3.14-50.extras.tar.xz 18260 SHA256 2450d342873d22742383d39b1de810e389382dfe3e0866ed98d63d1ad2af0d9f SHA512 e47465ab6e97d5396770a4732787aff1c9d4f77510b7d48f379b82a97b9c10078cd07355f74c22d8c1920ca2ff3c9d0aa678d09b5981406bd4c4f0d14027a2dc WHIRLPOOL 64d4d9c88022622abf66df511e3423afc771018ce563e1b545d7e44e0b87887da8d00771ed38db02f579d4899915ecffd564d479a6a1c813ef304eb7d63733cd
+DIST genpatches-3.14-51.base.tar.xz 979896 SHA256 4c01297fde28b4e064916e931df04fb888b4d2ad780a4084a911d73218dc3ecc SHA512 339d034b016d9c301a4e04b0c3c8cd8975cb3b8096a356fa46687859d9d561a3a17b987fa0b048c802e8024effb8fad7ed91729e72b2d9b587ebf00276f8a6d5 WHIRLPOOL 0dd6c7a1e53099ac7eb4b195948be09c129f994eff33778b77d2b88589d347a19761fdbc4ae94c55167418d2b61a2f1a923841a429cea18802530cfe0dd3aff1
+DIST genpatches-3.14-51.experimental.tar.xz 60328 SHA256 2af6e311587d83c4ed168e87aa908b3bbcfb1840703037923386088628471791 SHA512 482037e0cf87544dcfce0f481d3a32618594a908b25e3c5489426f28850c40b7973ff4202533172ce35dc89193b7a0af05829e4816c830b13ca944b811e27a51 WHIRLPOOL 27ec472519267151312713f05ad13564642dfeff2ef30bf141c9b5e23208f33bbde23b6d7c1312bb5a8eac831e475efcd91c11e0a1ac1598d2d806c7d4fec403
+DIST genpatches-3.14-51.extras.tar.xz 18268 SHA256 8e7e3861802699df6c947a3f1e64755f09a4f9bf2bb78c4c9839412b2674ab06 SHA512 daecd52aa81a990cf6e71fce9826491e61580a3f89e94a492358e953940c6ced000b0c359826e608fbc6f3faace6a76871dfeb673b1a2f4fceb1c04bcc91e3c0 WHIRLPOOL fc739357b3162eddf63f521de1daa834a684511700b31143d76f34abf59c206b9ec910ba1cd5921999f45066dcd2811da5af7b35cbaab9b88db4b4f9c02138e4
 DIST genpatches-3.18-16.base.tar.xz 444356 SHA256 9868f2d0a808026bbbe276193ef98a5bb65e881f6dbf347940d338e347b5a269 SHA512 6e10a76c0dbb53e82775f271dcc2077a4fa3681c92df7ed7c7d3abffcb31b19221fbf17f031e884235a62223b9a8c2ebb8c4998c1e692e3808b56c5bd7d4c1b9 WHIRLPOOL 3992b4bcf377fc4d4ba450fc7487c8be18de9bf37b49661f51a57587c2e6e4721e46c5f961a39396d7f94793fac30aa0e6a21a39ed3344b8f789fdb000d5a093
 DIST genpatches-3.18-16.experimental.tar.xz 61624 SHA256 1bab18d2a9e3995dc466533d8df2bff16ebac6170e11bf31b6c51de3170b5696 SHA512 551c1f9745f078fb5094240e7fc58fb877f6af601bff6c4dc742ecac5f0b9a1f0ec98752b7c47e56a05e2f7f9f6b79103e5ba8881ef80a5e83cd6208091307c7 WHIRLPOOL 357c25ac76680ce5a1844ce368149cb3b33eb73748b244ed6cc9d0afcdd518d643ff9c80808ac4c52871f633f104f368557c5af7e8186ae3219174ee2530bb4e
 DIST genpatches-3.18-16.extras.tar.xz 16188 SHA256 0861244845ec3dc87c5cc070ad413ac98fb435e51bc20cd41354cef8967216b9 SHA512 59b830567f423c20f0c2c8b3123c44c61ab81dae1d35f4e62a5dd291f4b34772bf5116405086228aa5ed3712721e33309d1783d2921eac49c413f7e8b4cdc5d0 WHIRLPOOL 05cc5027107bc1c0f32b3189f84432b5ccbf2ed93792709ef52859fe1cd75018714f893ffca52c675af82b88398d8c072a9cfbe1a6703fd9b7ba6ea121cdcee3
+DIST genpatches-3.18-17.base.tar.xz 489076 SHA256 46ec429229380585e73dfde06e11868d5f3b2212720c0ab57f6023eff0a2e4ba SHA512 af269677d88a2e3a1feb66c26c5a12d967f41606e486903858f982d1cbfbb57a54c26585b6765592337fdb424aa13b714b1bbeec1520e263d64518be3d766476 WHIRLPOOL 74ed70843cb81b493fa86fe334430a7d43d88df3c5c58075a33cea762f8126dece50338ceca9114843c6703836cfd85a7ff2e000e75d2e4fe227010041563bfd
+DIST genpatches-3.18-17.experimental.tar.xz 61604 SHA256 efd6d02daf759fb77ebd7f6654ba933bce007abc414ed67f3667115dd6c15bd9 SHA512 95abf4e05ec31944a2ff520cfce68753656c966e575b5e23823753bb25da5f1c7f169d908f58df81db7dd75f9dbf1b1060dfb9c6349eabb2d1273086fbb09912 WHIRLPOOL b89d32886fccd7c5be7f65df647f75918e8f0aa3eddd4baccb6b06da5fedb00c04516a600bf48530ee4821dee416580b695bea677607b7ce905156ac0300134f
+DIST genpatches-3.18-17.extras.tar.xz 16184 SHA256 cadde114f6229bbb92092ae76a0dbba11b4c4841bd0daa8f8520e6e64308254f SHA512 8637aaad4c901937cea64317a85416e328fae1802ddb51b638d68f9a1746b5ad136d6b398105056c047c5d9d5437f5f3ab763a8be3581625e5bc4be16a84a0b5 WHIRLPOOL 2b340ace5325ddbf4149337c8cb1d387c846de061c18269fc1ed207c138e2c4ceaf6cac85a4d969ac0f5433993f7617386494ae4a7bd2281d92ec5852a91f04d
 DIST genpatches-3.19-9.base.tar.xz 257836 SHA256 94ca8760c25b14e705dbdc4584c78b4ba71655bcb3529c9fed3a24c41e144231 SHA512 118bd7d89bd7652ae44cd01042f865a846668ac2976f2344e9f72d6dadb4c3fdfda738e7a971656519831cbfdb6cc07a8c9b4513c88be707c3eb707d6e75a8f8 WHIRLPOOL 38df4344680cb3d38c384ac6a7ec2dfaf591cccca3795a1a1150cbf410ec4e4e8affa816c5dc3448b0310dd2b9c12e220aa6b85820fd9c68c8441ad6c2846e73
 DIST genpatches-3.19-9.experimental.tar.xz 61632 SHA256 c1668cb0ebe2c04a5f9d837cd0b42378ec9c1c53cacc4b02272462bd9e773c88 SHA512 86738abd9ce9eb007c96388a18710d8005760f5f2c36d12388af6d88cea2b60f81c2debe8d3e0af8f4ac83619a4797aa5a77b73c83adca1cbc6f397005c66561 WHIRLPOOL 8c8c5931b69a99106f38309df1367db16f6935357db1ed48a2fbeff5c266ac4801803485446d5a8a292c1c29d851c1b32dcc8ce161c6646227b9f1e75ae7621b
 DIST genpatches-3.19-9.extras.tar.xz 16280 SHA256 f0b77c7754741f000933a1450c39027c509ca66b44e78add44b100b02e415e5c SHA512 764e704d43573b80604f090b35b4c5913cc8d8abcb8f94590621df879668fdd0607db1a711a6fb24dd7b2ad709dff1110381e4b8072ad435ef7356639d8baacf WHIRLPOOL 6e8243526c27642cade7d1e9b36c6453c7a5ea63e99abae77ebd866365543930d1ee685b7a447f38e40bc8cfcbe84b01cbc8f5a6e443fe732b8e14ff3487a45d
@@ -27,6 +39,9 @@ DIST genpatches-4.0-6.extras.tar.xz 16280 SHA256 205c87c3d133a57d6ca42e2ce107cf6
 DIST genpatches-4.0-7.base.tar.xz 159536 SHA256 9d1e84cb5133489f76aa3ee4ffdc6a28331bed0c6557e383bdf288ec9461ff3c SHA512 49f29bc5b8d0953431dbd1c2c0b5fa0ae0eaad6ed744cddc5e8eeb3a6dc7aeb2231d9f491149fd0e9a4a9c10bfd336746a0b544b96d9212bc401091ee586eb46 WHIRLPOOL 355dfcdf5eb508cd840e506b32f3a9a39ef885bfc605b271574cc906492ad7a82c3f3511bbc519a912c56ad2cd0ab11d51a45602f20b03bc6441a11adc53d9d1
 DIST genpatches-4.0-7.experimental.tar.xz 61636 SHA256 419952353e98ed36dcdb9a45fe73b52449ec6b6d969dbf228f4dfc2da880f261 SHA512 1dcb8ede976b65304f3550aa55fb5cd0881861bc3507658f3e1927754ec37956e656ff053d546e5edd4f4ba63fbeca50f4a5c766229d5d05e5a69a4f2002f8b4 WHIRLPOOL 881f738f577ac15b977e3d3fa7e2abae427df196a0b33e96bb457ba36118e912e84bb8e36ee0baa67ab92ccfbffdcc2265cbae3034d618e25ab9b25db0791388
 DIST genpatches-4.0-7.extras.tar.xz 16276 SHA256 911ccb197f2c9514d8b4eacbdb7c059d709f64cb97632eae85cda99d61596ba4 SHA512 ce94b88735fde37b1337f111c91da0610b14b22ce5ac68bb082170acf23b8875cc1d2e7bc8354959a91bcbf10dee9fdd81d0cd173e21e8bd8d6f2ba157a737d9 WHIRLPOOL b8d32b09e5b9ec7af8307398fef31f5569c738dfdfc1832060e998f9fb5baa31cbb84eadab28b82d50fb7e6acbb381c55271128de4c5bc14febbb7dc4b1d1534
+DIST genpatches-4.0-8.base.tar.xz 187784 SHA256 31988af608f3c3e2a6a676b8df416debbc6cbfba3fa0b0bab004de4c7acf5b79 SHA512 cbb54c89994d0cb34fd7c823572b3daec84295aece8af8119f260390ea70266ee7e4d9be700de63f6f9f9c1cdfc2e9e77bcac1862a6dd7b10162344870f59c3a WHIRLPOOL 702fa7f2a70f8b88f0645f1725f32ec98baf5a3abb4b07e4c407038ce50bd03967bf687d298e81482c83f5391197de03fcff414d8caf92cf1134e59d07436928
+DIST genpatches-4.0-8.experimental.tar.xz 61648 SHA256 37cadee8326e5da2ca8fc657de74c586a1ffea224d5f30ee0d05b35d26404505 SHA512 672b3c9f1e05ae0c2cc075eef3c47b8c7982774c0a24807509f8232eaf60b794ea37041f8c4293cd5c4e92fa956dc65b7916ab0df1abf906ac4273e0df617159 WHIRLPOOL 1e24cf7b34e22f85e77aaefacfaea35bc0b2cf55f98b75ce24c4e6649e11b2dd8e7d0de5c794675e11f17886a7e762bb97c1a824d0d07db14e51b23e7d69d4fa
+DIST genpatches-4.0-8.extras.tar.xz 16280 SHA256 ea2a886f46e800b321b14168bb1b28be6fadeed8b7e7ba0f3d03d8604554814a SHA512 ab4b9c98bf65859a2e6036cd63e6373dfdbc2ad4a4360117de58be70df94342792b56673056dc8c04c07ed744c641e233df771680ea7257dd6486bd5d9e84e71 WHIRLPOOL d684bf7de81357b2a1ac5632d166319d69946e6da2556b62cd5576c10a700dc65856eb69d3acd50265bb292f9440d5fd3b93ca588c301613e4c49a1b4cbdbdd3
 DIST linux-3.10.tar.xz 73175088 SHA256 df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 SHA512 5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 WHIRLPOOL e7c0ccc2231e430b831218fc66f1940d095d2d5447d391329c6a7373d4a1d16708f64778b32e4847802ee2dae4fcf7cb67a1238fd4eb204fd0c4bce2d8134053
 DIST linux-3.12.tar.xz 76384600 SHA256 2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02 SHA512 4ba5797e0772726d05c9f2eee66dc6dc2a5033c749ef44764c805a83da739ed5d0c6443b76785e38fe1ef74cc7ade787e48144faed0cfcb6f124f05248c700ff WHIRLPOOL a40195f6b53ba3440cf90a44495f6a59670f750851d1518e2bdfe3b949f0e898d1df5d37e271c31c555087026ddb6cc2c9109b22b9639e3222735e6f650a1417
 DIST linux-3.14.tar.xz 78399152 SHA256 61558aa490855f42b6340d1a1596be47454909629327c49a5e4e10268065dffa SHA512 5730d83a7a81134c1e77c0bf89e42dee4f8251ad56c1ac2be20c59e26fdfaa7bea55f277e7af156b637f22e1584914a46089af85039177cb43485089c74ac26e WHIRLPOOL 5ad07b78c362ba0b21c50b4abb99407cae06bd08576f3fd8f36047b01409eba096263208020da3dcad4977eefc61d66502276754097bc127635df1d7a5817d41
@@ -36,11 +51,16 @@ DIST linux-3.4.tar.xz 66748028 SHA256 ff3dee6a855873d12487a6f4070ec2f7996d073019
 DIST linux-4.0.tar.xz 82313052 SHA256 0f2f7d44979bc8f71c4fc5d3308c03499c26a824dd311fdf6eef4dee0d7d5991 SHA512 ce13d2c1c17908fd9a4aa42bb6348a0cb13dd22e560bd54c61b8bfdf62726d6095f130c59177a2fe4793b7dc399481bf10d3556d1d571616000f180304e5a995 WHIRLPOOL c481256e23dc82209942d4f2fc9a94aa7fc4c3c69b05eaa041a58ca4bdc5781274ec4c49d597ccf94b634d61418ec578d20a6569c6c7052b4d3cf33611c99001
 DIST tuxonice-for-linux-3.10.77-2015-05-11.patch.bz2 129101 SHA256 9ce88fa2f23795d9738bef2fb0eb583d8c691255e1196673220a26624ca99e95 SHA512 97260e8191211786748a6fd001f9f04a37bf3e40243335b6a4693c5abea2627c2b7d6a923459f8c9a4b06dce007702a9aad5a6f707d8634c01701e46f2caeefe WHIRLPOOL 87942e73c69b1cdddfe534a328e3a2b54580978146196b0d1c2b55e75620511c828ec039b6790d65ff2ca3e34320e912c19c2ef510ef5fdf2c2a18973008b432
 DIST tuxonice-for-linux-3.10.79-2015-06-04.patch.bz2 129101 SHA256 9ce88fa2f23795d9738bef2fb0eb583d8c691255e1196673220a26624ca99e95 SHA512 97260e8191211786748a6fd001f9f04a37bf3e40243335b6a4693c5abea2627c2b7d6a923459f8c9a4b06dce007702a9aad5a6f707d8634c01701e46f2caeefe WHIRLPOOL 87942e73c69b1cdddfe534a328e3a2b54580978146196b0d1c2b55e75620511c828ec039b6790d65ff2ca3e34320e912c19c2ef510ef5fdf2c2a18973008b432
+DIST tuxonice-for-linux-3.10.80-2015-06-17.patch.bz2 129101 SHA256 9ce88fa2f23795d9738bef2fb0eb583d8c691255e1196673220a26624ca99e95 SHA512 97260e8191211786748a6fd001f9f04a37bf3e40243335b6a4693c5abea2627c2b7d6a923459f8c9a4b06dce007702a9aad5a6f707d8634c01701e46f2caeefe WHIRLPOOL 87942e73c69b1cdddfe534a328e3a2b54580978146196b0d1c2b55e75620511c828ec039b6790d65ff2ca3e34320e912c19c2ef510ef5fdf2c2a18973008b432
 DIST tuxonice-for-linux-3.12.42-2015-05-11.patch.bz2 129289 SHA256 16cec6808d846f74d045ffb5abac40527a7a4f5de4d881373150f95cbaaa28dd SHA512 7a920a7f84548444aa5dfbe706ca72fa6cda69fa8fd352f771c7a7e3373a845739b078394fbacec74704bfc27fb1b53b6bd896593bcf1fa2858d44fe31b10b99 WHIRLPOOL ce3690592872f77ae61a580378bb86d9fd9fb3a3c8df8d143227b28ca7b0d63caadfcfb1eccf508dbc4eb9ca916cdd4097663159b7d20e5ebd5c3ab835d8c120
+DIST tuxonice-for-linux-3.12.44-2015-06-17.patch.bz2 129258 SHA256 ca9ede7cf81f23fc378a9a917d37544583215dd59f3a43b4f18f1ced276a119e SHA512 6cc7f0468657e98cc8a2e58d440bbd76f16fbe55dd97593d6de7553b029000c2cbff9cbef19f10f5d72130c37acabcd31fea078984c46d66922a0d49242d0ff3 WHIRLPOOL c605e15a47e164191f2df19c9ef7ff73bcd4a4d2aed66e599a89562aa5239f947557bc916e8ed25b673a3c2122624514ae69f67365847a33824848e14a6fef02
 DIST tuxonice-for-linux-3.14.41-2015-05-11.patch.bz2 129460 SHA256 9ca130949f210cdc53e02bcf4058fab23620b29a713d16c78fd412d2d6b03971 SHA512 1c799c38cb7c1593451046a849f116af7ade6bf204feca72df6d3c05375b495e478446aade873b89f69f675c320d0e7979f022870c35c2c9ed08f4b2133b70ba WHIRLPOOL fa79bbf4bf8758112b2d148a8db10a69230f10dfb7df588ecc9a2d8fc2b0713ee92f2e362ffb0edf0253ed61f0f6d5e6d9aba7dce277e91035bb8ef23ff83a3d
 DIST tuxonice-for-linux-3.14.43-2015-06-04.patch.bz2 129413 SHA256 c447cfd0395c952fd1758730587d33b1cebd5a8b2f93fddad23a965197e591a1 SHA512 424d5b05927359b3af151a42a4d3518cca7586bd54556f641f32dada668bad5f7ef6a76acf6de29b9dd69f4eb6ffda35acf339ad1ab6058a5f3edad7543db121 WHIRLPOOL 94f186389f618a3450ad471b909362d72db1bf4b3506387a13e2845ea7c499f828c93397c52a3b837f77fb893a1bca13bd72f1d496488894cafda2dc4fc27561
+DIST tuxonice-for-linux-3.14.44-2015-06-17.patch.bz2 129413 SHA256 c447cfd0395c952fd1758730587d33b1cebd5a8b2f93fddad23a965197e591a1 SHA512 424d5b05927359b3af151a42a4d3518cca7586bd54556f641f32dada668bad5f7ef6a76acf6de29b9dd69f4eb6ffda35acf339ad1ab6058a5f3edad7543db121 WHIRLPOOL 94f186389f618a3450ad471b909362d72db1bf4b3506387a13e2845ea7c499f828c93397c52a3b837f77fb893a1bca13bd72f1d496488894cafda2dc4fc27561
 DIST tuxonice-for-linux-3.18.13-2015-05-11.patch.bz2 127804 SHA256 2a95a32caa69c9fd2e3a2c1473f491f8c8b7809690abcd9a571702df662c6add SHA512 bf4126061c191a12b2740c4b618945386391e57659e241cfebab3192e21de32d5adb2ec8284a223c32884762f49d47b3b9b27e4ea98e1eb5e52edff6d88e1bbf WHIRLPOOL 1ef56722272435e6ade12eadf699739b1ce9f0ff1eeaedcd1a5102953da3b9e0511f847f0641282c0353f8eaa0fa45fe9d33937b96d3e3d2a4f2c37ccc56cc1b
+DIST tuxonice-for-linux-3.18.16-2015-06-17.patch.bz2 127476 SHA256 baeaa16b599c46beff946aa916dd941447e55855e1129bf4d476033e39e2a693 SHA512 88cf3ed0d8cbca20fa9708f98dca962253eec7897e0d4b6b3c7207f7c36e9544d38afbfabd2e1697dd206d426b7c0a72af3502b891ffe7df75dfaeb4b25ea762 WHIRLPOOL e68d7c55d321761c1d8c4294b2133b91a4ac1d7ebb5003819d05d94b64b1427c9ce64417b51ac008995cad567a6580df8c96c55e39d0fb5670c5634a9766b6aa
 DIST tuxonice-for-linux-3.19.8-2015-05-12.patch.bz2 131125 SHA256 054a5cdb85b8bb40fd35c1c0992ab115db95b9d90483de76f917cb86d061c0fc SHA512 7181090e107624e5503092c16008c2dc1c7ad05039b73c8c2e7256978004d10990f3317805794e47381e793c4970ddeef9fef433c2ea3946fa19eb4eb50b1dc4 WHIRLPOOL 518fc5db2588038bb2a8c28bb26ad7fa113caaa9e82d0eda6fc503bf336d528245f99dd10976c252a31d2e906953c594a7ef1d7c4c7a68369921e94119cfb177
 DIST tuxonice-for-linux-3.4.107-2015-04-18.patch.bz2 131546 SHA256 c2802f72c7cce5b6811b4476b8135a8e9aa7c715c3807b2c60f92cc84c661caf SHA512 4f4da36b697db267e8153e4336f0458aea9093f20eee8e809a61f2addaba3b9707c73ed6656ad54cbac006bfb08d64f5cd9eb0e2fb9990b00e126e7af15c8178 WHIRLPOOL a4c05d1325a1326273506b07721ec8b7618db17e5fbe5c23353fee922714889a92a19063727ec308e1b63ba6b7912a2ee9b80a9a30cdf837090dc18c4a366adf
 DIST tuxonice-for-linux-4.0.2-2015-05-11.patch.bz2 133135 SHA256 4b92d07f35ef87aba311e61f5fa8df93caae5f4d13cabc36601de85d8a148410 SHA512 248d71a8041d9b14709823a4d26d8a11629b26fefaad27672180407224e70a5f6a80422f37aa34599534122553925fa01483c84449fd12437f3b7f28c7db111b WHIRLPOOL 3452d69cfd7260ecbde78ae0342dca2b610c6aa6a56569c0917839e881c94cdc0bb79fcb95034fa070f52f4e41f92d9812c181c27186738cfeb4e24ec9a15b09
 DIST tuxonice-for-linux-4.0.4-2015-06-04.patch.bz2 134035 SHA256 fe591fb892e1e4c8438314357e1e78ec2f2f40a68f87f1b334edb5ffe8069dac SHA512 87e610ca49af0057ff86612c0f8093445f26978b70878e75c8edd8011f67d2ba89f22fec784e276ea8b5b8f77ab8f2a9afafd5f64bcf2869eb39016722d6d406 WHIRLPOOL 5dbc1bb24641cba9e4bf055503dbef5ab0fe25246ed04910f442a20f9e4a7ddffbec7d63833ceed2f9315c36cb166a9631ac0e75f2e2c740064420fda16d4234
+DIST tuxonice-for-linux-4.0.5-2015-06-17.patch.bz2 133769 SHA256 9296692f3e2143039a781404ba761ff43bd4e51f9d1bd4ac295357e98ebbec80 SHA512 ee0212e8aac25ae7a7abca8e9e93ce0a3b67e5eee314a977b601a29c019db6a47f72c2e4057840be051486c3bba51170690e07e493063c9e6b0dd49b59350e62 WHIRLPOOL 4caa2a43546d115fc586cb978e2d6d62884347c9f3f95e2b6de6450476e20e6c7dbb15d2a2a5f128b2317dfd78bb3a6b944023608263eea05dcc393ec719d03d
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.81.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.81.ebuild
new file mode 100644
index 000000000000..6c2586270575
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.81.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.10.81.ebuild,v 1.1 2015/06/27 02:12:46 floppym Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="87"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.10.80"
+TUXONICE_DATE="2015-06-17"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.44.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.44.ebuild
new file mode 100644
index 000000000000..5b3c6786ee75
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.44.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.12.44.ebuild,v 1.1 2015/06/27 02:12:46 floppym Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="43"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.12.44"
+TUXONICE_DATE="2015-06-17"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.45.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.45.ebuild
new file mode 100644
index 000000000000..a5d75588b0db
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.45.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.14.45.ebuild,v 1.1 2015/06/27 02:12:46 floppym Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="51"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.14.44"
+TUXONICE_DATE="2015-06-17"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.16.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.16.ebuild
new file mode 100644
index 000000000000..3f07a6d45ad5
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.16.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-3.18.16.ebuild,v 1.1 2015/06/27 02:12:46 floppym Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="17"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="3.18.16"
+TUXONICE_DATE="2015-06-17"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-kernel/tuxonice-sources/tuxonice-sources-4.0.6.ebuild b/sys-kernel/tuxonice-sources/tuxonice-sources-4.0.6.ebuild
new file mode 100644
index 000000000000..20ddc992f7b3
--- /dev/null
+++ b/sys-kernel/tuxonice-sources/tuxonice-sources-4.0.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/tuxonice-sources/tuxonice-sources-4.0.6.ebuild,v 1.1 2015/06/27 02:12:46 floppym Exp $
+
+EAPI="5"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="8"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+DESCRIPTION="TuxOnIce + Gentoo patchset sources"
+HOMEPAGE="http://dev.gentoo.org/~mpagano/genpatches/ http://tuxonice.nigelcunningham.com.au/ https://github.com/NigelCunningham/tuxonice-kernel"
+
+TUXONICE_PV="4.0.5"
+TUXONICE_DATE="2015-06-17"
+
+TUXONICE_PATCH="tuxonice-for-linux-${TUXONICE_PV}-${TUXONICE_DATE}.patch.bz2"
+TUXONICE_URI="http://tuxonice.nigelcunningham.com.au/downloads/all/${TUXONICE_PATCH}"
+UNIPATCH_LIST="${DISTDIR}/${TUXONICE_PATCH}"
+UNIPATCH_STRICTORDER="yes"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${TUXONICE_URI}"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="experimental"
+
+RDEPEND="${RDEPEND}
+	>=sys-apps/tuxonice-userui-1.0
+	|| ( >=sys-power/hibernate-script-2.0 sys-power/pm-utils )"
+
+K_EXTRAELOG="If there are issues with this kernel, please direct any queries to the tuxonice-users mailing list:
+http://lists.tuxonice.net/mailman/listinfo/tuxonice-users/"
+K_SECURITY_UNSUPPORTED="1"
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 791763369950..5d427e38ce86 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -11,8 +11,8 @@ DIST db-4.8.30.tar.gz 22887305 SHA256 e0491a07cdb21fb9aa82773bbbedaeb7639cbd0e7f
 DIST db-5.1.29.tar.gz 32188074 SHA256 a943cb4920e62df71de1069ddca486d408f6d7a09ddbbb5637afe7a229389182 SHA512 b3487161cc09dd0aee6117d685d0bc0a58854cf5e96f9e778969a51d3a61b66f8e007b76e584e4ef73f84e07d4418b89c2f6697e34c1ad4072609b11b7b4c5b0 WHIRLPOOL c2c5e335a8ed85f9dd947eb8225148c9633d21f5e17d321a6938b50d4bf061e735563cdbefb8c8aa457923ef80e778f95ad80aba4a92a381432ecf52c2a25353
 DIST db-5.3.28.tar.gz 35090431 SHA256 e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628 SHA512 e91bbe550fc147a8be7e69ade86fdb7066453814971b2b0223f7d17712bd029a8eff5b2b6b238042ff6ec1ffa6879d44cb95c5645a922fee305c26c3eeaee090 WHIRLPOOL ad9042c4509ece1cae42ade4734f69d59a9ec946a85bd486063a7e8f9fa1ae3f925b71f0475fef05a27d33f695ef82ffd06fbaadbd7dc5bfaa77a8caacf9d1dc
 DIST db-6.0.30.tar.gz 36584356 SHA256 608e4b1cf390e9bf54c0ef00c5bd9ca76d36e2261b9f4d33d54516f3f6a20fd2 SHA512 ea249c59dba18cad391f523840028ba8ef962c32f2c7470942d52f9c07f18ba9fdf964dcd545cb7f2d6c66b91924a0ba1478af1d8f81f0dcbbf94c97ac515cf9 WHIRLPOOL 6784730d250dd480bacf78e966c6acb2fb3ca2c3989668e9440a0a60376b009850b2b48fc35f47e3964b175e78501d18b1c3e3b265831165083fe2dd04a46eb3
-DIST db-6.1.19.tar.gz 37492835 SHA256 ad8aa5f9ede68118732f78718128e29e4d765e46a87dce54fa9143d9de8684ce SHA512 6b8340c91768238e50969388d42d355f71f69ebf598916623ef7acacd9ee6150e214d78f04bd2bf3803c459e86680db07d43b8c6a4e8f5750f72b94481575adf WHIRLPOOL 66e2fc70ff362cf7c36f9ecf4ef9c3ebb60ce8fa0db9e08d7aa80f8aa74a087a9b53614a830d79e7f88aaac2e8b207f2a0933b9f15b134148261e9bb9a76865e
 DIST db-6.1.23.tar.gz 37465841 SHA256 822e1591f7f535c5eb16389fbd5c1f14877a9561674cc1d497f1db318ef86107 SHA512 2299d9bb7b6bd9fe7637cd64f2985d9a776b8be1984bcd13195a31fef4824a474285a606bca98ae128909c5274ddb06c0a12e2e592d55f26f099d4a76e760026 WHIRLPOOL 82312c330b227c6572fc85ae0912bcf8f21bfc5e317d9beaf191aaf29d818ee567805bb46fafb3d047ad3360ab848ec3ac1d62ba507bb9e4344e6985917ad785
+DIST db-6.1.26.tar.gz 37495772 SHA256 dd1417af5443f326ee3998e40986c3c60e2a7cfb5bfa25177ef7cadb2afb13a6 SHA512 2590ee3d9e30e6eaeb350edbc2fa7400582c0b520177fe0a3a57a966573268e18ad10b1dc6dee3fb1be9c93ac6f96f848c120793eaf873562464edd125cff4d4 WHIRLPOOL 9aad6c2ec058d332185c630904dca766ca9f9c017c8f6216a4363f007fced3b7cf1b91d76134fa676780f6f8e37966bdea75845deb5cb2dff8f4b432e8068f5f
 DIST db.1.85.tar.gz 270953 SHA256 4220d4ddeb77fb57ba2f37c1aa105d561d3ef85a6fb89c79c3edd735d0e193c6 SHA512 03bf3a2b0947efdca4e38719542e96378b5eeb57da64d5030dd23ab710773c1826f1c867032d0bea658b7fdd8272db253e97bbc490d198b9437025ffdf9e880e WHIRLPOOL 802346b9fc133f6c9316e987352e8bd8e12792b30b0eae9b4e2b3629c9bc8385ab12244dead428bb824945aab383cd4801de3fc705667797bdf6159066ed1352
 DIST patch.3.2.9.1 2139 SHA256 6d89a42ee0be9e47b3e8a42981c65266a556de84bc6281edcf0f977f52547798 SHA512 f410c43ea4af28a39d8ea47f774d38b53bf1183a34abfcf1f27e253eb61b42f4b5e9f0a3a500e174eb796ea342e6dd50a8bb95ff3eb8ee188461489cc994b8f9 WHIRLPOOL 3a879d5306403739465550ade1fbf53ac62b832fbdf507a204fef13949bc7be9c35ddd972834d3ca74bf17c421791011200556dffd95265eb64849f1d7b647ec
 DIST patch.3.2.9.2 495 SHA256 61db874796fe8789b0045f456285b27c5b8b7b8902a5e342a115456015716d0e SHA512 cc75fef11a641d480beaa2b62201177c72d10c4eb20376b5f15769db6e9e1a0da41c0365d79772af19b4cacdaa9f91dad049c735de9f95b98dcfc4f0b611b557 WHIRLPOOL 1362c32dc16875a97b451ff52415fe4b9e9d37b256a92c7e86c14a52431937352ae55ecee4361459e9036b9bea238c205a8f0d4406ac7e47387a8cda22906879
diff --git a/sys-libs/db/db-6.1.19.ebuild b/sys-libs/db/db-6.1.26.ebuild
similarity index 98%
rename from sys-libs/db/db-6.1.19.ebuild
rename to sys-libs/db/db-6.1.26.ebuild
index e9cdf83a4c33..2ba30a1480de 100644
--- a/sys-libs/db/db-6.1.19.ebuild
+++ b/sys-libs/db/db-6.1.26.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/db/db-6.1.19.ebuild,v 1.3 2015/03/20 14:41:50 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-6.1.26.ebuild,v 1.1 2015/06/26 13:40:34 polynomial-c Exp $
 
 EAPI=5
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools multilib multilib-minimal versionator toolchain-funcs
diff --git a/virtual/libgudev/libgudev-230.ebuild b/virtual/libgudev/libgudev-230.ebuild
new file mode 100644
index 000000000000..e6b251d1dd0e
--- /dev/null
+++ b/virtual/libgudev/libgudev-230.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/virtual/libgudev/libgudev-230.ebuild,v 1.1 2015/06/27 17:34:13 floppym Exp $
+
+EAPI=5
+inherit multilib-build
+
+DESCRIPTION="Virtual for libgudev providers"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="introspection static-libs"
+
+DEPEND=""
+RDEPEND="dev-libs/libgudev:0/0[${MULTILIB_USEDEP},introspection?,static-libs?]"
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index a4ead046aee0..05f04f614a93 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,4 @@
 DIST chromium-43.0.2357.130.tar.xz 304344816 SHA256 62fb55439396a5d49ba53d4377e8d2554c14c2e8a6255f07909ccee8f248002e SHA512 b12479ee18c05a1f34f7efeb50d0255e134441ee18923310bbe4cd87b60eb51ce8ea9831350545b88dd803367f84cb5e335f3655707718bbfed09e2d55751f9d WHIRLPOOL a9df316dbc14485fbb3016b4c0dab98e35c7b42be5b8ed920bf91ced091534c581320dc7c35c7362a4a12015db509f3ccb392e0fcf23f12c36feddd61b923897
-DIST chromium-43.0.2357.65.tar.xz 309208380 SHA256 3f8f87d982b5ee14862e49dcfa44e02009e401cb29f9758e253f9fd952c57eed SHA512 d08043c33ab46054c46f6c38873c75f2c8b2a82837d24f7c23a94aa993c663497ae2602ac1951b2bc519ac3db44f92ebf2bf14ce6e4e7a08daeea45acccff5fa WHIRLPOOL e9b02a9cad0e711fbd1c3a767d865f7eadf82d87c60cb65ba279542ddd77d6317ab136261a60c986cadcd4e9fcce3227a35d4f9972384df7c40a62407457ef61
-DIST chromium-43.0.2357.73.tar.xz 309192528 SHA256 489c66bc6e5d0f07df5b446af0903bb690e3333a95cbbb9566c75e2990f10dee SHA512 3fad45ae54033c8376ee8953c1a6c7127d9d58ca8d9ba59a74d10ea5d725515bd0bac1d642448e9949b2416b597127fab04e2b7a150814e77f00be359a390208 WHIRLPOOL 68b833e3f9318ad43763f2fc25cdd611a17cb4930ee6f2080aa941a837d891e814ccba3c20f5f18806f66707eab4339a2f11b4cd52d8872896eb610b3fa00fe2
 DIST chromium-44.0.2403.18.tar.xz 307086188 SHA256 a5abaf7c2527ca4f629c35230543e6d2e2c40026825b1380ec35447211644a4d SHA512 505f40dc341779d7be00fcf6ae5901a0b83a65d37d60c4deddcc1af30b349a0d6d931abab7c9c504c4de6e4d9b9bb46bc45c2d28638c729e7731a23e91f7e27a WHIRLPOOL 613dacd01449cbb15b80a9068878fe0006d88ceaee2ae99b0a6245a9b2aa5a51b4e09424fe54ece6e34244e6f0605a28ee051c02bfc5003982ef745981edc779
 DIST chromium-44.0.2403.30.tar.xz 307231808 SHA256 7e524d95841aaf9596e04720876015f34b9f80cb6394fedc3e29108987856026 SHA512 85bdb45c555e5d54ce2a77b875d3bb0631e513836464105f3c24df04b79655bff12136e7976369ed6abcdffe9b0ad4fd28c3bad166f399e47669cdbaf3c79c45 WHIRLPOOL f19c220707572cd729ccb294bb85ef5ec579fb2c0c3c918d6cb1d8b29f0a477961f49e404920f7d459491cac314a2c75c6312625cbf695cee8d7f676f48300e5
 DIST chromium-45.0.2431.0.tar.xz 319453440 SHA256 4a3aca8e29b7c1da879c3bb1320118cf15387c5797bc55d6378a878caacf3447 SHA512 70c21e5c0e36c4fdf607b4e588f553147681970e3554519d1a03037145c90a0ed1167405ec8413f753ec73c5fc7af1c638e6168aa973d129b4e2ab813eafd20d WHIRLPOOL a53114b909d7aec060c36f40936315aa58eb02cf30fee0d4f4dfcf6890ed14f9bca8ad277df65c8f98c3998643e914ff3bf890f17ad07538c021e309d5c45e44
diff --git a/www-client/chromium/chromium-43.0.2357.65.ebuild b/www-client/chromium/chromium-43.0.2357.65.ebuild
deleted file mode 100644
index 43e01a448f1b..000000000000
--- a/www-client/chromium/chromium-43.0.2357.65.ebuild
+++ /dev/null
@@ -1,642 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-43.0.2357.65.ebuild,v 1.5 2015/06/04 19:06:10 kensington Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
-	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="cups gnome gnome-keyring hidpi kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc widevine"
-RESTRICT="proprietary-codecs? ( bindist )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
-	app-arch/bzip2:=
-	app-arch/snappy:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	dev-libs/glib:=
-	dev-libs/icu:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	>=dev-libs/libevent-1.4.13:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	dev-libs/re2:=
-	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/flac:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	media-libs/harfbuzz:=[icu(+)]
-	media-libs/libexif:=
-	>=media-libs/libjpeg-turbo-1.2.0-r1:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.4.0:=
-	>=media-libs/libvpx-1.4.0:=
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	>=sys-libs/libcap-2.22:=
-	sys-libs/zlib:=[minizip]
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:=
-	x11-libs/gtk+:2=
-	x11-libs/libdrm
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	kerberos? ( virtual/krb5 )"
-DEPEND="${RDEPEND}
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	widevine? ( www-plugins/chrome-binary-plugins[widevine] )"
-	# We build-dep on having widevine, because the patch
-	# below must extract the current version.
-
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND+="
-	!=www-client/chromium-9999
-	!<www-plugins/chrome-binary-plugins-37
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
-
-# Python dependencies. The DEPEND part needs to be kept in sync
-# with python_check_deps.
-DEPEND+=" $(python_gen_any_dep '
-	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-')"
-python_check_deps() {
-	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-apps/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/gnome-icon-theme
-- x11-themes/tango-icon-theme
-"
-
-pkg_pretend() {
-	if [[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
-		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
-	fi
-
-	# Check build requirements, bug #541816 .
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	if [[ "${SLOT}" == "0" ]]; then
-		CHROMIUM_SUFFIX=""
-	else
-		CHROMIUM_SUFFIX="-${SLOT}"
-	fi
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	# if ! use arm; then
-	#	mkdir -p out/Release/gen/sdk/toolchain || die
-	#	# Do not preserve SELinux context, bug #460892 .
-	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
-	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
-	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
-	# fi
-
-	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
-	epatch "${FILESDIR}/${PN}-system-libvpx-r0.patch"
-
-	if use widevine; then
-		local WIDEVINE_VERSION="$(< "${ROOT}/usr/$(get_libdir)/chromium-browser/widevine.version")"
-		[[ -z $WIDEVINE_VERSION ]] && die "Could not determine Widevine version."
-		sed -e "s/@WIDEVINE_VERSION@/${WIDEVINE_VERSION}/" "${FILESDIR}/${PN}-widevine.patch" > "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch"
-		epatch "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch"
-		local WIDEVINE_SUPPORTED_ARCHS="x64 ia32"
-		local arch
-		for arch in $WIDEVINE_SUPPORTED_ARCHS; do
-			mkdir -p third_party/widevine/cdm/linux/$arch
-			cp "${ROOT}/usr/$(get_libdir)/chromium-browser/libwidevinecdm.so" third_party/widevine/cdm/widevine_cdm_*.h third_party/widevine/cdm/linux/$arch/ || die "Could not copy headers for Widevine."
-		done
-	fi
-
-	epatch_user
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py \
-		'base/third_party/dmg_fp' \
-		'base/third_party/dynamic_annotations' \
-		'base/third_party/icu' \
-		'base/third_party/nspr' \
-		'base/third_party/superfasthash' \
-		'base/third_party/symbolize' \
-		'base/third_party/valgrind' \
-		'base/third_party/xdg_mime' \
-		'base/third_party/xdg_user_dirs' \
-		'breakpad/src/third_party/curl' \
-		'chrome/third_party/mozilla_security_manager' \
-		'courgette/third_party' \
-		'crypto/third_party/nss' \
-		'net/third_party/mozilla_security_manager' \
-		'net/third_party/nss' \
-		'third_party/WebKit' \
-		'third_party/analytics' \
-		'third_party/angle' \
-		'third_party/angle/src/third_party/compiler' \
-		'third_party/brotli' \
-		'third_party/cacheinvalidation' \
-		'third_party/cld_2' \
-		'third_party/cros_system_api' \
-		'third_party/cython/python_flags.py' \
-		'third_party/dom_distiller_js' \
-		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
-		'third_party/ffmpeg' \
-		'third_party/fips181' \
-		'third_party/flot' \
-		'third_party/google_input_tools' \
-		'third_party/google_input_tools/third_party/closure_library' \
-		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
-		'third_party/hunspell' \
-		'third_party/iccjpeg' \
-		'third_party/jstemplate' \
-		'third_party/khronos' \
-		'third_party/leveldatabase' \
-		'third_party/libaddressinput' \
-		'third_party/libjingle' \
-		'third_party/libphonenumber' \
-		'third_party/libsecret' \
-		'third_party/libsrtp' \
-		'third_party/libudev' \
-		'third_party/libusb' \
-		'third_party/libxml/chromium' \
-		'third_party/libXNVCtrl' \
-		'third_party/libyuv' \
-		'third_party/lss' \
-		'third_party/lzma_sdk' \
-		'third_party/mesa' \
-		'third_party/modp_b64' \
-		'third_party/mojo' \
-		'third_party/mt19937ar' \
-		'third_party/npapi' \
-		'third_party/openmax_dl' \
-		'third_party/opus' \
-		'third_party/ots' \
-		'third_party/pdfium' \
-		'third_party/pdfium/third_party/base' \
-		'third_party/pdfium/third_party/bigint' \
-		'third_party/pdfium/third_party/freetype' \
-		'third_party/polymer' \
-		'third_party/protobuf' \
-		'third_party/qcms' \
-		'third_party/readability' \
-		'third_party/sfntly' \
-		'third_party/skia' \
-		'third_party/smhasher' \
-		'third_party/sqlite' \
-		'third_party/tcmalloc' \
-		'third_party/trace-viewer' \
-		'third_party/trace-viewer/third_party/components/polymer' \
-		'third_party/trace-viewer/third_party/d3' \
-		'third_party/trace-viewer/third_party/gl-matrix' \
-		'third_party/trace-viewer/third_party/jszip' \
-		'third_party/trace-viewer/third_party/tvcm' \
-		'third_party/trace-viewer/third_party/tvcm/third_party/beautifulsoup/polymer_soup.py' \
-		'third_party/undoview' \
-		'third_party/usrsctp' \
-		'third_party/web-animations-js' \
-		'third_party/webdriver' \
-		'third_party/webrtc' \
-		'third_party/widevine' \
-		'third_party/x86inc' \
-		'third_party/zlib/google' \
-		'url/third_party/mozilla' \
-		'v8/src/third_party/fdlibm' \
-		'v8/src/third_party/kernel' \
-		'v8/src/third_party/valgrind' \
-		--do-remove || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf+=" -Ddisable_nacl=1"
-
-	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
-	# myconf+=" -Ddisable_glibc=1"
-
-	# TODO: also build with pnacl
-	# myconf+=" -Ddisable_pnacl=1"
-
-	# It would be awkward for us to tar the toolchain and get it untarred again
-	# during the build.
-	# myconf+=" -Ddisable_newlib_untar=1"
-
-	# Make it possible to remove third_party/adobe.
-	echo > "${T}/flapper_version.h" || die
-	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_flac=1
-		-Duse_system_harfbuzz=1
-		-Duse_system_icu=1
-		-Duse_system_jsoncpp=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libwebp=1
-		-Duse_system_libvpx=1
-		-Duse_system_libxml=1
-		-Duse_system_libxslt=1
-		-Duse_system_minizip=1
-		-Duse_system_nspr=1
-		-Duse_system_re2=1
-		-Duse_system_snappy=1
-		-Duse_system_speex=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1"
-
-	# Needed for system icu - we don't need additional data files.
-	myconf+=" -Dicu_use_data_file_flag=0"
-
-	# TODO: patch gyp so that this arm conditional is not needed.
-	if ! use arm; then
-		myconf+="
-			-Duse_system_yasm=1"
-	fi
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use hidpi enable_hidpi)
-		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)
-		$(gyp_use tcmalloc use_allocator tcmalloc none)"
-
-	# Use explicit library dependencies instead of dlopen.
-	# This makes breakages easier to detect by revdep-rebuild.
-	myconf+="
-		-Dlinux_link_gsettings=1
-		-Dlinux_link_libpci=1
-		-Dlinux_link_libspeechd=1
-		-Dlibspeechd_h_prefix=speech-dispatcher/"
-
-	# TODO: use the file at run time instead of effectively compiling it in.
-	myconf+="
-		-Dusb_ids_path=/usr/share/misc/usb.ids"
-
-	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
-	myconf+="
-		-Dlogging_like_official_build=1"
-
-	if [[ $(tc-getCC) == *clang* ]]; then
-		myconf+=" -Dclang=1"
-	else
-		myconf+=" -Dclang=0"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	myconf+="
-		-Dclang_use_chrome_plugins=0
-		-Dhost_clang=0
-		-Dlinux_use_bundled_binutils=0
-		-Dlinux_use_bundled_gold=0
-		-Dlinux_use_gold_flags=0"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
-		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-		ffmpeg_target_arch=ia32
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-		# TODO: re-enable NaCl (NativeClient).
-		local CTARGET=${CTARGET:-${CHOST}}
-		if [[ $(tc-is-softfloat) == "no" ]]; then
-
-			myconf+=" -Darm_float_abi=hard"
-		fi
-		filter-flags "-mfpu=*"
-		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
-
-		if [[ ${CTARGET} == armv[78]* ]]; then
-			myconf+=" -Darmv7=1"
-		else
-			myconf+=" -Darmv7=0"
-		fi
-		myconf+=" -Dsysroot=
-			$(gyp_use neon arm_neon)
-			-Ddisable_nacl=1"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf+=" -Dtarget_arch=${target_arch}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf+=" -Ddisable_fatal_linker_warnings=1"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX RANLIB
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	export AR_host=$(tc-getBUILD_AR)
-	export CC_host=$(tc-getBUILD_CC)
-	export CXX_host=$(tc-getBUILD_CXX)
-	export LD_host=${CXX_host}
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -m 755 "${TMPDIR}" || die
-
-	local build_ffmpeg_args=""
-	if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-		build_ffmpeg_args+=" --disable-asm"
-	fi
-
-	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-	einfo "Configuring bundled ffmpeg..."
-	pushd third_party/ffmpeg > /dev/null || die
-	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-		--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-	chromium/scripts/copy_config.sh || die
-	chromium/scripts/generate_gyp.py || die
-	popd > /dev/null || die
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	einfo "Configuring Chromium..."
-	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
-	egyp_chromium ${myconf} || die
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	local ninja_targets="chrome chrome_sandbox chromedriver"
-
-	# Build mksnapshot and pax-mark it.
-	eninja -C out/Release mksnapshot || die
-	pax-mark m out/Release/mksnapshot
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release ${ninja_targets} || die
-
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome || die
-
-	newexe out/Release/chrome_sandbox chrome-sandbox || die
-	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
-	doexe out/Release/chromedriver || die
-
-	# if ! use arm; then
-	#	doexe out/Release/nacl_helper{,_bootstrap} || die
-	#	insinto "${CHROMIUM_HOME}"
-	#	doins out/Release/nacl_irt_*.nexe || die
-	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
-	# fi
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
-		sedargs+=(
-			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
-			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
-			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
-		)
-	fi
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
-
-	# Allow users to override command-line options, bug #357629.
-	dodir /etc/chromium || die
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default" || die
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin || die
-	doins out/Release/*.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
-	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
-	doexe out/Release/libffmpegsumo.so || die
-	if use widevine; then
-		doexe out/Release/libwidevinecdmadapter.so || die
-	fi
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser${CHROMIUM_SUFFIX}.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Chromium${CHROMIUM_SUFFIX}" \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
-		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
-				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
-		fi
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-43.0.2357.73.ebuild b/www-client/chromium/chromium-43.0.2357.73.ebuild
deleted file mode 100644
index 8efa1ad6ed95..000000000000
--- a/www-client/chromium/chromium-43.0.2357.73.ebuild
+++ /dev/null
@@ -1,642 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-43.0.2357.73.ebuild,v 1.2 2015/06/04 19:06:10 kensington Exp $
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit check-reqs chromium eutils flag-o-matic multilib multiprocessing pax-utils \
-	portability python-any-r1 readme.gentoo toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cups gnome gnome-keyring hidpi kerberos neon pic +proprietary-codecs pulseaudio selinux +tcmalloc widevine"
-RESTRICT="proprietary-codecs? ( bindist )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
-	app-arch/bzip2:=
-	app-arch/snappy:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	dev-libs/glib:=
-	dev-libs/icu:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	>=dev-libs/libevent-1.4.13:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	dev-libs/re2:=
-	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/flac:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	media-libs/harfbuzz:=[icu(+)]
-	media-libs/libexif:=
-	>=media-libs/libjpeg-turbo-1.2.0-r1:=
-	media-libs/libpng:0=
-	>=media-libs/libwebp-0.4.0:=
-	>=media-libs/libvpx-1.4.0:=
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	>=sys-libs/libcap-2.22:=
-	sys-libs/zlib:=[minizip]
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:=
-	x11-libs/gtk+:2=
-	x11-libs/libdrm
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	kerberos? ( virtual/krb5 )"
-DEPEND="${RDEPEND}
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	widevine? ( www-plugins/chrome-binary-plugins[widevine] )"
-	# We build-dep on having widevine, because the patch
-	# below must extract the current version.
-
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND+="
-	!=www-client/chromium-9999
-	!<www-plugins/chrome-binary-plugins-37
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )"
-
-# Python dependencies. The DEPEND part needs to be kept in sync
-# with python_check_deps.
-DEPEND+=" $(python_gen_any_dep '
-	dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-')"
-python_check_deps() {
-	has_version "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/jinja[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/ply[${PYTHON_USEDEP}]" && \
-		has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-Depending on your desktop environment, you may need
-to install additional packages to get icons on the Downloads page.
-
-For KDE, the required package is kde-apps/oxygen-icons.
-
-For other desktop environments, try one of the following:
-- x11-themes/gnome-icon-theme
-- x11-themes/tango-icon-theme
-"
-
-pkg_pretend() {
-	if [[ $(tc-getCC)$ == *gcc* ]] && \
-		[[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then
-		die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.'
-	fi
-
-	# Check build requirements, bug #541816 .
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	if [[ "${SLOT}" == "0" ]]; then
-		CHROMIUM_SUFFIX=""
-	else
-		CHROMIUM_SUFFIX="-${SLOT}"
-	fi
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	# if ! use arm; then
-	#	mkdir -p out/Release/gen/sdk/toolchain || die
-	#	# Do not preserve SELinux context, bug #460892 .
-	#	cp -a --no-preserve=context /usr/$(get_libdir)/nacl-toolchain-newlib \
-	#		out/Release/gen/sdk/toolchain/linux_x86_newlib || die
-	#	touch out/Release/gen/sdk/toolchain/linux_x86_newlib/stamp.untar || die
-	# fi
-
-	epatch "${FILESDIR}/${PN}-system-jinja-r7.patch"
-	epatch "${FILESDIR}/${PN}-system-libvpx-r0.patch"
-
-	if use widevine; then
-		local WIDEVINE_VERSION="$(< "${ROOT}/usr/$(get_libdir)/chromium-browser/widevine.version")"
-		[[ -z $WIDEVINE_VERSION ]] && die "Could not determine Widevine version."
-		sed -e "s/@WIDEVINE_VERSION@/${WIDEVINE_VERSION}/" "${FILESDIR}/${PN}-widevine.patch" > "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch"
-		epatch "${T}/${PN}-widevine-${WIDEVINE_VERSION}.patch"
-		local WIDEVINE_SUPPORTED_ARCHS="x64 ia32"
-		local arch
-		for arch in $WIDEVINE_SUPPORTED_ARCHS; do
-			mkdir -p third_party/widevine/cdm/linux/$arch
-			cp "${ROOT}/usr/$(get_libdir)/chromium-browser/libwidevinecdm.so" third_party/widevine/cdm/widevine_cdm_*.h third_party/widevine/cdm/linux/$arch/ || die "Could not copy headers for Widevine."
-		done
-	fi
-
-	epatch_user
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py \
-		'base/third_party/dmg_fp' \
-		'base/third_party/dynamic_annotations' \
-		'base/third_party/icu' \
-		'base/third_party/nspr' \
-		'base/third_party/superfasthash' \
-		'base/third_party/symbolize' \
-		'base/third_party/valgrind' \
-		'base/third_party/xdg_mime' \
-		'base/third_party/xdg_user_dirs' \
-		'breakpad/src/third_party/curl' \
-		'chrome/third_party/mozilla_security_manager' \
-		'courgette/third_party' \
-		'crypto/third_party/nss' \
-		'net/third_party/mozilla_security_manager' \
-		'net/third_party/nss' \
-		'third_party/WebKit' \
-		'third_party/analytics' \
-		'third_party/angle' \
-		'third_party/angle/src/third_party/compiler' \
-		'third_party/brotli' \
-		'third_party/cacheinvalidation' \
-		'third_party/cld_2' \
-		'third_party/cros_system_api' \
-		'third_party/cython/python_flags.py' \
-		'third_party/dom_distiller_js' \
-		'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \
-		'third_party/ffmpeg' \
-		'third_party/fips181' \
-		'third_party/flot' \
-		'third_party/google_input_tools' \
-		'third_party/google_input_tools/third_party/closure_library' \
-		'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
-		'third_party/hunspell' \
-		'third_party/iccjpeg' \
-		'third_party/jstemplate' \
-		'third_party/khronos' \
-		'third_party/leveldatabase' \
-		'third_party/libaddressinput' \
-		'third_party/libjingle' \
-		'third_party/libphonenumber' \
-		'third_party/libsecret' \
-		'third_party/libsrtp' \
-		'third_party/libudev' \
-		'third_party/libusb' \
-		'third_party/libxml/chromium' \
-		'third_party/libXNVCtrl' \
-		'third_party/libyuv' \
-		'third_party/lss' \
-		'third_party/lzma_sdk' \
-		'third_party/mesa' \
-		'third_party/modp_b64' \
-		'third_party/mojo' \
-		'third_party/mt19937ar' \
-		'third_party/npapi' \
-		'third_party/openmax_dl' \
-		'third_party/opus' \
-		'third_party/ots' \
-		'third_party/pdfium' \
-		'third_party/pdfium/third_party/base' \
-		'third_party/pdfium/third_party/bigint' \
-		'third_party/pdfium/third_party/freetype' \
-		'third_party/polymer' \
-		'third_party/protobuf' \
-		'third_party/qcms' \
-		'third_party/readability' \
-		'third_party/sfntly' \
-		'third_party/skia' \
-		'third_party/smhasher' \
-		'third_party/sqlite' \
-		'third_party/tcmalloc' \
-		'third_party/trace-viewer' \
-		'third_party/trace-viewer/third_party/components/polymer' \
-		'third_party/trace-viewer/third_party/d3' \
-		'third_party/trace-viewer/third_party/gl-matrix' \
-		'third_party/trace-viewer/third_party/jszip' \
-		'third_party/trace-viewer/third_party/tvcm' \
-		'third_party/trace-viewer/third_party/tvcm/third_party/beautifulsoup/polymer_soup.py' \
-		'third_party/undoview' \
-		'third_party/usrsctp' \
-		'third_party/web-animations-js' \
-		'third_party/webdriver' \
-		'third_party/webrtc' \
-		'third_party/widevine' \
-		'third_party/x86inc' \
-		'third_party/zlib/google' \
-		'url/third_party/mozilla' \
-		'v8/src/third_party/fdlibm' \
-		'v8/src/third_party/kernel' \
-		'v8/src/third_party/valgrind' \
-		--do-remove || die
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf+=" -Ddisable_nacl=1"
-
-	# Disable glibc Native Client toolchain, we don't need it (bug #417019).
-	# myconf+=" -Ddisable_glibc=1"
-
-	# TODO: also build with pnacl
-	# myconf+=" -Ddisable_pnacl=1"
-
-	# It would be awkward for us to tar the toolchain and get it untarred again
-	# during the build.
-	# myconf+=" -Ddisable_newlib_untar=1"
-
-	# Make it possible to remove third_party/adobe.
-	echo > "${T}/flapper_version.h" || die
-	myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_flac=1
-		-Duse_system_harfbuzz=1
-		-Duse_system_icu=1
-		-Duse_system_jsoncpp=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libwebp=1
-		-Duse_system_libvpx=1
-		-Duse_system_libxml=1
-		-Duse_system_libxslt=1
-		-Duse_system_minizip=1
-		-Duse_system_nspr=1
-		-Duse_system_re2=1
-		-Duse_system_snappy=1
-		-Duse_system_speex=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1"
-
-	# Needed for system icu - we don't need additional data files.
-	myconf+=" -Dicu_use_data_file_flag=0"
-
-	# TODO: patch gyp so that this arm conditional is not needed.
-	if ! use arm; then
-		myconf+="
-			-Duse_system_yasm=1"
-	fi
-
-	# Optional dependencies.
-	# TODO: linux_link_kerberos, bug #381289.
-	myconf+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use hidpi enable_hidpi)
-		$(gyp_use kerberos)
-		$(gyp_use pulseaudio)
-		$(gyp_use tcmalloc use_allocator tcmalloc none)"
-
-	# Use explicit library dependencies instead of dlopen.
-	# This makes breakages easier to detect by revdep-rebuild.
-	myconf+="
-		-Dlinux_link_gsettings=1
-		-Dlinux_link_libpci=1
-		-Dlinux_link_libspeechd=1
-		-Dlibspeechd_h_prefix=speech-dispatcher/"
-
-	# TODO: use the file at run time instead of effectively compiling it in.
-	myconf+="
-		-Dusb_ids_path=/usr/share/misc/usb.ids"
-
-	# Save space by removing DLOG and DCHECK messages (about 6% reduction).
-	myconf+="
-		-Dlogging_like_official_build=1"
-
-	if [[ $(tc-getCC) == *clang* ]]; then
-		myconf+=" -Dclang=1"
-	else
-		myconf+=" -Dclang=0"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	myconf+="
-		-Dclang_use_chrome_plugins=0
-		-Dhost_clang=0
-		-Dlinux_use_bundled_binutils=0
-		-Dlinux_use_bundled_gold=0
-		-Dlinux_use_gold_flags=0"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}"
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
-		-Dgoogle_default_client_id=329227923882.apps.googleusercontent.com
-		-Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-		ffmpeg_target_arch=ia32
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-		# TODO: re-enable NaCl (NativeClient).
-		local CTARGET=${CTARGET:-${CHOST}}
-		if [[ $(tc-is-softfloat) == "no" ]]; then
-
-			myconf+=" -Darm_float_abi=hard"
-		fi
-		filter-flags "-mfpu=*"
-		use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}"
-
-		if [[ ${CTARGET} == armv[78]* ]]; then
-			myconf+=" -Darmv7=1"
-		else
-			myconf+=" -Darmv7=0"
-		fi
-		myconf+=" -Dsysroot=
-			$(gyp_use neon arm_neon)
-			-Ddisable_nacl=1"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	myconf+=" -Dtarget_arch=${target_arch}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf+=" -Dwerror="
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf+=" -Ddisable_fatal_linker_warnings=1"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX RANLIB
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	export AR_host=$(tc-getBUILD_AR)
-	export CC_host=$(tc-getBUILD_CC)
-	export CXX_host=$(tc-getBUILD_CXX)
-	export LD_host=${CXX_host}
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -m 755 "${TMPDIR}" || die
-
-	local build_ffmpeg_args=""
-	if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-		build_ffmpeg_args+=" --disable-asm"
-	fi
-
-	# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-	einfo "Configuring bundled ffmpeg..."
-	pushd third_party/ffmpeg > /dev/null || die
-	chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-		--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-	chromium/scripts/copy_config.sh || die
-	chromium/scripts/generate_gyp.py || die
-	popd > /dev/null || die
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	einfo "Configuring Chromium..."
-	build/linux/unbundle/replace_gyp_files.py ${myconf} || die
-	egyp_chromium ${myconf} || die
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@"
-}
-
-src_compile() {
-	local ninja_targets="chrome chrome_sandbox chromedriver"
-
-	# Build mksnapshot and pax-mark it.
-	eninja -C out/Release mksnapshot || die
-	pax-mark m out/Release/mksnapshot
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release ${ninja_targets} || die
-
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome || die
-
-	newexe out/Release/chrome_sandbox chrome-sandbox || die
-	fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-
-	doexe out/Release/chromedriver || die
-
-	# if ! use arm; then
-	#	doexe out/Release/nacl_helper{,_bootstrap} || die
-	#	insinto "${CHROMIUM_HOME}"
-	#	doins out/Release/nacl_irt_*.nexe || die
-	#	doins out/Release/libppGoogleNaClPluginChrome.so || die
-	# fi
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	if [[ -n ${CHROMIUM_SUFFIX} ]]; then
-		sedargs+=(
-			-e "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g"
-			-e "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g"
-			-e "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:"
-		)
-	fi
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver${CHROMIUM_SUFFIX} || die
-
-	# Allow users to override command-line options, bug #357629.
-	dodir /etc/chromium || die
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default" || die
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin || die
-	doins out/Release/*.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
-	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
-
-	doexe out/Release/libffmpegsumo.so || die
-	if use widevine; then
-		doexe out/Release/libwidevinecdmadapter.so || die
-	fi
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser${CHROMIUM_SUFFIX}.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Chromium${CHROMIUM_SUFFIX}" \
-		chromium-browser${CHROMIUM_SUFFIX} \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
-		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
-			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
-				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
-		fi
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index 6a0fae2ba6bf..5864b9e4ff4a 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,3 +1,3 @@
-DIST epiphany-3.12.1.tar.xz 3026432 SHA256 16d9f8f10443328b2f226c2da545e75c8433f50f103af8aeb692b098d5fbbf93 SHA512 fd87ea87b3f599eb78f21fd6c2e03dc2c7579c1fb459b60e04d593acabbfc08206fb59996df72db0d2ee532e1d2848c238cb8491a9737f961a131450730b400a WHIRLPOOL 977659b0211a0ee0b233ea33a449d6c9d5173281674cb05173742546efa8a567d6274090b3bbfb6caa09eac8bd69406369733e76f414dee96348b70596061eba
 DIST epiphany-3.14.2.tar.xz 3063764 SHA256 cc69403b3b7addf30dd6eb703265a77102b8ab3c6194678ad0d2433f251492d0 SHA512 895f70768c4c765fdc221b2d44bfbb6e7599b0231b0af1a7a8a869fd461db6a09cbdd7a0120bda5dfd583d1d667391c574f18caf1aef5971b474d34911581dc7 WHIRLPOOL 0e235b3190b0ef42a9caa241258060dd5db1e8db07275102ec50b5223931badc56b6ad0c7ec32ccf27d74308845d4d9aef736775bbf6e5290a5d9275bd5c669a
 DIST epiphany-3.16.1.tar.xz 3084364 SHA256 4e59a13c299d1ce726871958e1925b42f93d8c73bf1bb0decf79749be00e9666 SHA512 2ab72e97e377f1b22ddf59f2ecaeebfa57c2d7ac519181a3e28acc0aeea17f0dff9d610ec561077c320ddb8fd5f9f2d06c82f7d6e4dd324f401c49f6aa2e55ca WHIRLPOOL 5ff0ed9c0272c6c44f50cf2eae07f3abbf03f6cfdc3ae8c14cebb99b8b2a6588c253815a3c5c56c2ed680d8ea599eda4a2a279ae9269aba67876243af63848f8
+DIST epiphany-3.16.2.tar.xz 3084952 SHA256 a621b5f443bc168980d12452f1a031e0a50d99ffc825989a38b14d398def73e6 SHA512 424408e24bf69f8ad62e4c384d916890e128d164c8ab0c2932fa143f2989f017eb56d0b4a9c5e77518124c1e6d233df152ab6b85e3a1f26f28ddc97200c5aa83 WHIRLPOOL 2c970e2b22742193f7c2e9fd17a55f528132eb77dea0b3c8f83faf3c3f7d530343ccc26de51871a98fb92ab185b691b1d5dab49853b8415852c7b8b8518e6635
diff --git a/www-client/epiphany/epiphany-3.12.1.ebuild b/www-client/epiphany/epiphany-3.16.2.ebuild
similarity index 62%
rename from www-client/epiphany/epiphany-3.12.1.ebuild
rename to www-client/epiphany/epiphany-3.16.2.ebuild
index fb2e661b2a7c..3974edb6c437 100644
--- a/www-client/epiphany/epiphany-3.12.1.ebuild
+++ b/www-client/epiphany/epiphany-3.16.2.ebuild
@@ -1,12 +1,13 @@
-# 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/www-client/epiphany/epiphany-3.12.1.ebuild,v 1.5 2014/10/28 19:42:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany/epiphany-3.16.2.ebuild,v 1.1 2015/06/27 16:47:01 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2 pax-utils versionator virtualx
+#inherit autotools eutils gnome2 pax-utils versionator virtualx
+inherit eutils gnome2 pax-utils versionator virtualx
 
 DESCRIPTION="GNOME webbrowser based on Webkit"
 HOMEPAGE="https://wiki.gnome.org/Apps/Web"
@@ -15,20 +16,20 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Web"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+jit +nss test"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 COMMON_DEPEND="
 	>=app-crypt/gcr-3.5.5
 	>=app-crypt/libsecret-0.14
 	>=app-text/iso-codes-0.35
-	>=dev-libs/glib-2.38:2
+	>=dev-libs/glib-2.38:2[dbus]
 	>=dev-libs/libxml2-2.6.12:2
 	>=dev-libs/libxslt-1.1.7
 	>=gnome-base/gsettings-desktop-schemas-0.0.1
 	>=net-dns/avahi-0.6.22[dbus]
-	>=net-libs/webkit-gtk-2.4:3[jit?]
-	>=net-libs/libsoup-2.42.1:2.4
-	>=x11-libs/gtk+-3.11.6:3
+	>=net-libs/webkit-gtk-2.7.4:4[jit?]
+	>=net-libs/libsoup-2.48:2.4
+	>=x11-libs/gtk+-3.13:3
 	>=x11-libs/libnotify-0.5.1:=
 	gnome-base/gnome-desktop:3=
 
@@ -46,24 +47,29 @@ RDEPEND="${COMMON_DEPEND}
 	!www-client/epiphany-extensions
 "
 # paxctl needed for bug #407085
-# eautoreconf requires gnome-common and yelp-tools
+# eautoreconf requires gnome-common-3.5.5
 DEPEND="${COMMON_DEPEND}
-	gnome-base/gnome-common
+	>=gnome-base/gnome-common-3.6
 	>=dev-util/intltool-0.50
 	sys-apps/paxctl
 	sys-devel/gettext
 	virtual/pkgconfig
-	app-text/yelp-tools
 "
 
-# Tests refuse to run with the gsettings trick for some reason
-RESTRICT="test"
-
 src_prepare() {
-	# Fix missing symbol in webextensio.so
-	epatch "${FILESDIR}"/${PN}-3.12.0-missing-symbol.patch
+	# Fix missing symbol in webextension.so, https://bugzilla.gnome.org/show_bug.cgi?id=728972
+	# FIXME: More information needed per https://bugzilla.gnome.org/show_bug.cgi?id=728972#c5
+	# If you are able to reproduce the failure, please provide it. Thanks
+#	epatch "${FILESDIR}"/${PN}-3.14.0-missing-symbol.patch
+
+	# Fix unittests
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751591
+	epatch "${FILESDIR}"/${PN}-3.16.0-unittest-1.patch
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=751593
+	epatch "${FILESDIR}"/${PN}-3.14.0-unittest-2.patch
 
-	eautoreconf
+#	eautoreconf
 	gnome2_src_prepare
 }
 
@@ -73,8 +79,7 @@ src_configure() {
 		--disable-static \
 		--with-distributor-name=Gentoo \
 		$(use_enable nss) \
-		$(use_enable test tests) \
-		ITSTOOL=$(type -P true)
+		$(use_enable test tests)
 }
 
 src_compile() {
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index 5520799b07dd..869296862de8 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,6 +1,3 @@
-DIST adobe-flash-11.2.202.466-debug.i386.tar.gz 7415367 SHA256 9bd88305af7bd3460da416cad520dc021ba3dd7a9c526146a771d078e68f0750 SHA512 d9bb71a213401d579955714c8aad33dee33b013d716a5a22711694311fe74789502e934a40c3c8cedd4926bd6ffcdd59ddd8eae1b6f3a8fa24430a888632c571 WHIRLPOOL 84aa575aaf084d4a12912a917c12e8cc8dcf3d1ed782c5ffc891440a49f2b8f0f222fd19a0ada917d92e43bcb2af54184ba812f8b04babc5ec085eaf04095bb5
-DIST adobe-flash-11.2.202.466.i386.tar.gz 6934400 SHA256 30718b8af36247d5713e63e533cdb67b9f98a8b241e203c9d0fd34b34654fdef SHA512 88e8c3c0925079b74907041127a9c2be3e7c3403fe5dd7bec4e02fffd62ea46863710f58ca866c918f0c0e4e092484e951c197e4f11c0097a5783ed5575839ad WHIRLPOOL 2ec4b222f20d8184cb055ab509aa5685ae48f98c0d38f4ae4a4d3d55564b9c77c8fca1ec87da37b80d500e85651bf28c342b50764ec8d7b60210a26b8edbd6d5
-DIST adobe-flash-11.2.202.466.x86_64.tar.gz 7246913 SHA256 a884194f5125144b63ba8137f7859ee587acfa4b211ea9d13093bd5330749cb2 SHA512 ae7249b83cc943f98cd77dc1603a8ce30d93ca7821dd3a598888a39d16e109cfc15ee688654428889e06bd3a6768fb0a9f84078c36b478dcf6fefa43967f7533 WHIRLPOOL 7b7be330547d3f527918d0f8580932f826acec8f5b5ac1764b104468fb4c711c1b6a054b1937baf5580511b43ab7828d75158b2c4a99a096ca31e41404cae86b
 DIST adobe-flash-11.2.202.468-debug.i386.tar.gz 7416165 SHA256 a80381ef428b64c7e04f6ee3d4c915d359e424ab856833acfb48199359ea63e7 SHA512 3b03e2fdb5b7a8171a91b93b1cfc8a828b035e273a63ea59c87933cb1facfb43cc8843a60d25086f06c5de72002956f5a6060a260145252207b2986e5e7bf559 WHIRLPOOL c3d4d42e10d135e2015a068d97969b03cae88e86642d9045da4169db668840e85856749fd048c2e07679c6af4b743ea6df5e13331db164cd9aeaf1ac600bf216
 DIST adobe-flash-11.2.202.468.i386.tar.gz 6935039 SHA256 146d5c67a78fb43ab8d48d3c73b05d3ff90654c004eb94abb31610a0da6b9fad SHA512 ac6048f17340c631ca239691137aa5ef5aae44237233ae6952795662826bccabf24297c75637a0b98fa978d756121533645b8499fb965adde9e05c8f4526f3ba WHIRLPOOL 4d71c96aea3bf37b7ec35af95af3efd7b5f13f61e56598e12853435e12ba018b203f52aaaaa5592fe51c1a7f3e4b7627942e9f96a33c034c8173f02c7d01a826
 DIST adobe-flash-11.2.202.468.x86_64.tar.gz 7247794 SHA256 f483be2fc948f263ad9a472bba041aff03a3b7a5c13bf2d3ff8442ce0acfcbef SHA512 0ca941c4a1157d0ee7558c3a772f9552ace0dc0fa1d900ef21048b6dec351f778e02fc6f70dc6f7f16f227a12b741578641c21e48d634599fbc749a3d4d6a56a WHIRLPOOL d870c3bf80cd81372c11934d536d7867f7d09ec582795223679cd87511d94cfe054bead41b6db36f524394507eea7a626553b58dca2916c77e601a8c040986bb
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild
deleted file mode 100644
index 49d2ce6f6eae..000000000000
--- a/www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.466.ebuild,v 1.4 2015/06/14 16:42:14 ulm Exp $
-
-EAPI=5
-inherit nsplugins toolchain-funcs versionator multilib multilib-minimal
-
-DESCRIPTION="Adobe Flash Player"
-HOMEPAGE="
-	http://www.adobe.com/products/flashplayer.html
-	http://get.adobe.com/flashplayer/
-"
-
-AF_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc"
-AF_DB_URI="http://fpdownload.macromedia.com/pub/flashplayer/updaters"
-PV_M=$(get_major_version)
-AF_32_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.i386.tar.gz -> ${P}.i386.tar.gz"
-AF_64_URI="${AF_URI}/${PV}/install_flash_player_${PV_M}_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
-AF_32_DB_URI="${AF_DB_URI}/${PV_M}/flashplayer_${PV_M}_plugin_debug.i386.tar.gz -> ${P}-debug.i386.tar.gz"
-
-SRC_URI="
-	abi_x86_32? (
-		!debug? ( ${AF_32_URI} )
-		debug? ( ${AF_32_DB_URI} )
-	)
-	abi_x86_64? ( ${AF_64_URI} )
-"
-IUSE="debug kde selinux cpu_flags_x86_sse2"
-REQUIRED_USE="
-	cpu_flags_x86_sse2
-	debug? ( abi_x86_32 )
-	|| ( abi_x86_64 abi_x86_32 )
-"
-SLOT="0"
-
-KEYWORDS="-* amd64 x86"
-LICENSE="AdobeFlash-11.x"
-RESTRICT="strip mirror"
-
-S="${WORKDIR}"
-
-NATIVE_DEPS="
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	kde? (
-		dev-qt/qtcore:4
-		dev-qt/qtdbus:4
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-		kde-base/kdelibs
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libXau
-		x11-libs/libXdmcp
-		x11-libs/libXext
-		x11-libs/libXft
-		x11-libs/libXpm
-	)
-	media-libs/fontconfig
-	media-libs/freetype
-	>=sys-libs/glibc-2.4
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/pango
-"
-
-DEPEND="
-	amd64? ( abi_x86_32? ( !abi_x86_64? ( www-plugins/nspluginwrapper ) ) )
-"
-RDEPEND="
-	${DEPEND}
-	abi_x86_64? ( ${NATIVE_DEPS} )
-	abi_x86_32? (
-		amd64? (
-			>=dev-libs/atk-2.10.0[abi_x86_32(-)]
-			>=dev-libs/glib-2.34.3:2[abi_x86_32(-)]
-			>=dev-libs/nspr-4.10.4[abi_x86_32(-)]
-			>=dev-libs/nss-3.15.4[abi_x86_32(-)]
-			>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
-			>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
-			>=x11-libs/cairo-1.12.14-r4[abi_x86_32(-)]
-			>=x11-libs/gdk-pixbuf-2.30.7[abi_x86_32(-)]
-			>=x11-libs/gtk+-2.24.23:2[abi_x86_32(-)]
-			>=x11-libs/libX11-1.6.2[abi_x86_32(-)]
-			>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
-			>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
-			>=x11-libs/libXrender-0.9.8[abi_x86_32(-)]
-			>=x11-libs/libXt-1.1.4[abi_x86_32(-)]
-			>=x11-libs/pango-1.36.3[abi_x86_32(-)]
-		)
-		x86? ( ${NATIVE_DEPS} )
-	)
-	|| ( media-fonts/liberation-fonts media-fonts/corefonts )
-	selinux? ( sec-policy/selinux-flash )
-"
-
-# Ignore QA warnings in these closed-source binaries, since we can't fix them:
-QA_PREBUILT="usr/*"
-
-any_cpu_missing_flag() {
-	local value=${1}
-	grep '^flags' /proc/cpuinfo | grep -qv "${value}"
-}
-
-pkg_setup() {
-	unset need_lahf_wrapper
-	if use abi_x86_64 && any_cpu_missing_flag 'lahf_lm'; then
-		export need_lahf_wrapper=1
-	fi
-}
-
-src_unpack() {
-	local files=( ${A} )
-
-	multilib_src_unpack() {
-		mkdir -p "${BUILD_DIR}" || die
-		cd "${BUILD_DIR}" || die
-
-		# we need to filter out the other archive(s)
-		local other_abi
-		[[ ${ABI} == amd64 ]] && other_abi=i386 || other_abi=x86_64
-		unpack ${files[@]//*${other_abi}*/}
-	}
-
-	multilib_parallel_foreach_abi multilib_src_unpack
-}
-
-src_configure() { :; }
-
-multilib_src_compile() {
-	if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
-		# This experimental wrapper, from Maks Verver via bug #268336 should
-		# emulate the missing lahf instruction affected platforms.
-		set -- $(tc-getCC) -fPIC -shared -nostdlib -lc \
-			-oflashplugin-lahf-fix.so  "${FILESDIR}/flashplugin-lahf-fix.c"
-		echo "${@}" >&2
-		"${@}" || die "Compile of flashplugin-lahf-fix.so failed"
-	fi
-}
-
-multilib_src_install() {
-	# PLUGINS_DIR comes from nsplugins.eclass
-	exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
-	doexe libflashplayer.so
-
-	if [[ ${ABI} == amd64 && ${need_lahf_wrapper} ]]; then
-		# This experimental wrapper, from Maks Verver via bug #268336 should
-		# emulate the missing lahf instruction affected platforms.
-		doexe flashplugin-lahf-fix.so
-	fi
-
-	if multilib_is_native_abi; then
-		if use kde; then
-			local pkglibdir=lib
-			[[ -d usr/lib64 ]] && pkglibdir=lib64
-
-			exeinto /usr/$(get_libdir)/kde4
-			doexe usr/${pkglibdir}/kde4/kcm_adobe_flash_player.so
-			insinto /usr/share/kde4/services
-			doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
-		else
-			# No KDE applet, so allow the GTK utility to show up in KDE:
-			sed -i usr/share/applications/flash-player-properties.desktop \
-				-e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
-		fi
-
-		# The userland 'flash-player-properties' standalone app:
-		dobin usr/bin/flash-player-properties
-
-		# Icon and .desktop for 'flash-player-properties'
-		insinto /usr/share
-		doins -r usr/share/{icons,applications}
-		dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
-			/usr/share/pixmaps/flash-player-properties.png
-	fi
-
-	# The magic config file!
-	insinto "/etc/adobe"
-	doins "${FILESDIR}/mms.cfg"
-}
-
-unregister_pluginwrapper() {
-	# TODO: Perhaps parse the output of 'nspluginwrapper -l'
-	# TODO: However, the 64b flash plugin makes
-	# TODO: 'nspluginwrapper -l' segfault.
-	local FLASH_WRAPPER="${ROOT}/usr/lib64/${PLUGINS_DIR}/npwrapper.libflashplayer.so"
-	if has_version 'www-plugins/nspluginwrapper' && [[ -f ${FLASH_WRAPPER} ]]; then
-		einfo "Removing 32-bit plugin wrapper"
-		nspluginwrapper -r "${FLASH_WRAPPER}"
-	fi
-}
-
-pkg_postinst() {
-	if use amd64 ; then
-		if [[ ${need_lahf_wrapper} ]]; then
-			ewarn "Your processor does not support the 'lahf' instruction which is used"
-			ewarn "by Adobe's 64-bit flash binary. We have installed a wrapper which"
-			ewarn "should allow this plugin to run. If you encounter problems, please"
-			ewarn "adjust your USE flags to install only the 32-bit version and reinstall:"
-			ewarn " ${CATEGORY}/${PN}[abi_x86_32,-abi_x86_64]"
-			elog
-		fi
-		# needed to clean up upgrades from older installs
-		if use abi_x86_64 && [[ -n ${REPLACING_VERSIONS} ]]; then
-			unregister_pluginwrapper
-		fi
-		if has_version 'www-plugins/nspluginwrapper'; then
-			if use abi_x86_32 && ! use abi_x86_64; then
-				einfo "nspluginwrapper detected: Installing plugin wrapper"
-				local oldabi="${ABI}"
-				ABI="x86"
-				local FLASH_SOURCE="${ROOT}/usr/lib32/${PLUGINS_DIR}/libflashplayer.so"
-				nspluginwrapper -i "${FLASH_SOURCE}"
-				ABI="${oldabi}"
-			fi
-		elif use abi_x86_32; then
-			elog "To use the 32-bit flash player in a native 64-bit browser,"
-			elog "you must install www-plugins/nspluginwrapper"
-		fi
-	fi
-}
-
-pkg_prerm() {
-	use amd64 && use abi_x86_32 && ! use abi_x86_64 && \
-		unregister_pluginwrapper
-}
diff --git a/www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild b/www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild
index 75e735694a83..282cafb5954e 100644
--- a/www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild
+++ b/www-servers/monkeyd/monkeyd-1.5.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-servers/monkeyd/monkeyd-1.5.6-r1.ebuild,v 1.4 2015/06/19 16:23:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-1.5.6-r1.ebuild,v 1.5 2015/06/26 12:15:13 ago Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@ SRC_URI="http://monkey-project.com/releases/${PV:0:3}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm ~mips ppc ppc64 ~x86"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~x86"
 
 # ssl is broken, so we turn it off until fixed
 IUSE="-debug jemalloc php minimal elibc_musl elibc_uclibc monkeyd_plugins_auth monkeyd_plugins_cheetah cgi monkeyd_plugins_dirlisting fastcgi +monkeyd_plugins_liana monkeyd_plugins_logger monkeyd_plugins_mandril"
diff --git a/www-servers/tornado/Manifest b/www-servers/tornado/Manifest
index 325bfc258190..314b465b2839 100644
--- a/www-servers/tornado/Manifest
+++ b/www-servers/tornado/Manifest
@@ -5,3 +5,4 @@ DIST tornado-4.0.1.tar.gz 314852 SHA256 ae058668b276b1ec7383cfc911323e6d27b3b47e
 DIST tornado-4.0.2.tar.gz 315841 SHA256 900c5124ebdb6598ca8e8a0c5888f41a5f14117952d5515258e3d20222b21bfa SHA512 93591068dc63af8d50a7925d528bc0cccdd705232c529b6162619fe28dddaf115e8a460b1842877d35160bd7ed480c1bd0bdbec57d1f359085bd1814e0c1c242 WHIRLPOOL e00484208ec70c55ca7a0bfb383a5f26928882ce547c274de8597312e539296c29edbbfdcece40c161bcfc71b5b74c42653625310a7c7cd5d2b244faa6027692
 DIST tornado-4.1.0.tar.gz 427424 SHA256 bf00fe845576a729f57e86dc3a7e767bf101e018eebbc86bf8c0148094409733 SHA512 bbe79aed51a29d4868557ad1ccea391a0c28b9702c40bdad21665a53796650884de8621c0f4333e2edeed268e0cf97a7807086b1513c63257a8bf02ef98d261f WHIRLPOOL 0231e010a021bd2cba13cee1c108abfe4850b7753655b0dd6edf22b72f04e7ba9a723fa434bd64aeae41f6c4c14fd189563e795c4843ed6255b1b7975287f306
 DIST tornado-4.2.0_beta1.tar.gz 433456 SHA256 216e505f14978143248030e62c275853272316fbd20f3447e40c7295898a2a8e SHA512 ebd5c2a7ef3d99e24821de685560e5810d8d0986bb394897cb9bdd799b221a5c6e314bedd589b6e374e4cae5425372e13b25b932a4c701820952f260f8bc46f7 WHIRLPOOL 6b1dfb9df5d24363fd85c2ab2864106d637c97268b4a58342481d292baf2856604ae61d99bded9e259e7d2ef12647169c18392a474246f09a16b17f2f20df315
+DIST tornado-4.2.tar.gz 433734 SHA256 e8b1207da67dbdceebfb291292b4ef1b547d6171525bec1b366853f923456a5f SHA512 b9f27cf544b0743bd08687c3cea2882528786d4bb1158b1f1b97b6e1b8c170396c07032802f6daafec3be9a21975f73292a321a160a17bad1d215e40f2e9244e WHIRLPOOL 76070b3c9bed55232a8b36f0bb45f398c142a04d5bb7c11e8cf152eec68eaa54804e9452a8042f01710cd45b8e2bfdfddbcfe911854a158a93f47e201ae89f20
diff --git a/www-servers/tornado/tornado-4.2.ebuild b/www-servers/tornado/tornado-4.2.ebuild
new file mode 100644
index 000000000000..8f343394402d
--- /dev/null
+++ b/www-servers/tornado/tornado-4.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tornado/tornado-4.2.ebuild,v 1.1 2015/06/26 12:49:52 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_3 python3_4 )
+
+inherit distutils-r1 vcs-snapshot
+
+MY_PV=${PV/.0_beta/b}
+
+DESCRIPTION="Tornado is a Python web framework and asynchronous networking library, ... ."
+HOMEPAGE="http://www.tornadoweb.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+CDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/pycurl-7.18.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/asyncio[${PYTHON_USEDEP}]' 'python3_3')
+	$(python_gen_cond_dep 'dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]' 'python2_7')
+	$(python_gen_cond_dep 'dev-python/futures[${PYTHON_USEDEP}]' 'python2_7 pypy')
+	$(python_gen_cond_dep 'dev-python/singledispatch[${PYTHON_USEDEP}]' 'python2_7 python3_3')
+	$(python_gen_cond_dep 'dev-python/twisted-names[${PYTHON_USEDEP}]' 'python2_7')
+	$(python_gen_cond_dep 'dev-python/twisted-web[${PYTHON_USEDEP}]' 'python2_7')
+"
+# dev-python/twisted-* only supports python2_7 currently
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)
+	test? (
+		${CDEPEND}
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)
+"
+RDEPEND="${CDEPEND}"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/drop-intersphinx.patch
+	)
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs sphinx
+}
+
+python_test() {
+	"${PYTHON}" -m tornado.test.runtests || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+	use examples && local EXAMPLES=( demos/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-352.21.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-352.21.ebuild
index a6ba1b677c1b..71f8c4a88253 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-352.21.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-352.21.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/x11-drivers/nvidia-drivers/nvidia-drivers-352.21.ebuild,v 1.2 2015/06/23 06:09:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-352.21.ebuild,v 1.3 2015/06/27 06:20:55 jer Exp $
 
 EAPI=5
 
@@ -24,7 +24,7 @@ SRC_URI="
 
 LICENSE="GPL-2 NVIDIA-r2"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* amd64 x86 ~amd64-fbsd ~x86-fbsd"
 RESTRICT="bindist mirror strip"
 EMULTILIB_PKG="true"
 
diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch
new file mode 100644
index 000000000000..25ad7451d311
--- /dev/null
+++ b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch
@@ -0,0 +1,11 @@
+--- configure.ac~	2014-05-13 20:53:02.000000000 +0200
++++ configure.ac	2015-06-27 11:29:32.574106982 +0200
+@@ -95,7 +95,7 @@
+ 	DO_CHECK=$enableval, DO_CHECK=yes)
+ 
+ if test	"$DO_CHECK" = "yes"; then
+-	accepted_versions="1.2 1.4 2.0"
++	accepted_versions="1.2 1.4 2.0 2.1"
+ 	AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
+ 	AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
+ 	ok="no"
diff --git a/x11-libs/libcryptui/libcryptui-3.12.2.ebuild b/x11-libs/libcryptui/libcryptui-3.12.2.ebuild
index 7acc4054af02..74399a9c33b5 100644
--- a/x11-libs/libcryptui/libcryptui-3.12.2.ebuild
+++ b/x11-libs/libcryptui/libcryptui-3.12.2.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/x11-libs/libcryptui/libcryptui-3.12.2.ebuild,v 1.5 2015/06/22 19:00:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libcryptui/libcryptui-3.12.2.ebuild,v 1.6 2015/06/27 09:33:25 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="User interface components for OpenPGP"
 HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
@@ -25,11 +25,9 @@ COMMON_DEPEND="
 	x11-libs/libSM
 
 	>=app-crypt/gpgme-1
-	|| (
-		=app-crypt/gnupg-2.0*
-		=app-crypt/gnupg-1.4* )
+	>=app-crypt/gnupg-1.4
 
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
 	libnotify? ( >=x11-libs/libnotify-0.7:= )
 "
 DEPEND="${COMMON_DEPEND}
@@ -45,11 +43,15 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
+	# Support GnuPG 2.1, https://bugzilla.gnome.org/show_bug.cgi?id=745843
+	epatch "${FILESDIR}"/${PN}-3.12.2-gnupg-2.1.patch
+
 	# FIXME: Do not mess with CFLAGS with USE="debug"
 	sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
 		-e 's/-Werror//' \
 		-i configure.ac configure || die "sed failed"
 
+	eautoreconf
 	gnome2_src_prepare
 }
 
diff --git a/x11-misc/alock/Manifest b/x11-misc/alock/Manifest
index 2f17eac748ce..c2d8ef0a2a3d 100644
--- a/x11-misc/alock/Manifest
+++ b/x11-misc/alock/Manifest
@@ -1,2 +1 @@
-DIST alock-svn-60.tar.bz2 64818 RMD160 30448c69817efb4d7979958ca32f07e9276c1795 SHA1 508edc150517963310eb1518eeb1831552f68d54 SHA256 27e7b6b0c8dc2443c349f12288d11d2b01f20fd2e61e55ef712362176577667d
-DIST alock-svn-94.tar.bz2 68140 RMD160 791ae96a87a0fc2c6c5fec76090277407e68bd66 SHA1 2e07e92abfc43950505c8af35a6b5f474f1a22de SHA256 37938b56588e0e9bdfdf52097bccd000f992ea725c87cd8c8b3ea4df847e8f26
+DIST alock-svn-94.tar.bz2 68140 SHA256 37938b56588e0e9bdfdf52097bccd000f992ea725c87cd8c8b3ea4df847e8f26
diff --git a/x11-misc/alock/alock-60-r3.ebuild b/x11-misc/alock/alock-60-r3.ebuild
deleted file mode 100644
index 1e1919ae3555..000000000000
--- a/x11-misc/alock/alock-60-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alock/alock-60-r3.ebuild,v 1.9 2010/06/05 10:50:59 hwoarang Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="locks the local X display until a password is entered"
-HOMEPAGE="http://code.google.com/p/alock/
-	http://darkshed.net/projects/alock"
-SRC_URI="http://alock.googlecode.com/files/alock-svn-${PV}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="imlib pam"
-
-DEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm
-	x11-libs/libXrender
-	x11-libs/libXcursor
-	imlib? ( media-libs/imlib2[X] )
-	pam? ( virtual/pam )"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/alock-svn-${PV}
-
-src_prepare() {
-	sed -i 's|\$(DESTDIR)\$(prefix)/man|\$(DESTDIR)\$(prefix)/share/man|g' \
-		"${S}"/Makefile || die "sed failed"
-}
-
-src_configure() {
-	econf --with-all \
-		$(use_with pam) \
-		$(use_with imlib imlib2) \
-	|| die "configure failed"
-}
-
-src_install() {
-	dobin src/alock || die
-	doman alock.1 || die
-	dodoc README.txt CHANGELOG.txt || die
-
-	insinto /usr/share/alock/xcursors
-	doins contrib/xcursor-* || die
-
-	insinto /usr/share/alock/bitmaps
-	doins bitmaps/* || die
-}
-
-pkg_postinst() {
-	if ! use pam; then
-		einfo "pam support disabled"
-		einfo "In order to authenticate against /etc/passwd, "
-		einfo "/usr/bin/alock will need to be SUID"
-	fi
-}
diff --git a/x11-misc/e16keyedit/Manifest b/x11-misc/e16keyedit/Manifest
index 67f885831890..6a642b5e06ce 100644
--- a/x11-misc/e16keyedit/Manifest
+++ b/x11-misc/e16keyedit/Manifest
@@ -1,3 +1 @@
-DIST e16keyedit-0.4.tar.gz 80061 SHA256 04a68fbd6f6675c3cc3565319f2f137781291055e9bd266793bb9c6dd7a4fb24
-DIST e16keyedit-0.6.tar.gz 86141 SHA256 50d9c8bdd066ea5b45fea2e3ec6a2d137d9a09276fdba3300da9861241f45757
 DIST e16keyedit-0.7.tar.gz 88323 SHA256 8f9aa35ca5355f7a5bee04f4cced0922ed0f690be2d10f5a8e39680e391c09a2 SHA512 6178977bd9e1dfd337717660be8102f5c3f0a6d29d4b0b1ae67a7fa9a812ab46c4fee67e52282ca38d429d16697935e25e7c046f22d7f3bb06b7b3933e6d557b WHIRLPOOL 33192e9ee9fa2826855b69e109f70ddd71c9b338d2d7095e2739ac2fda75640371370fb61183819e252080893dca1a2b3f14f1c56e4416dd28bc1e406297d6e3
diff --git a/x11-misc/e16keyedit/e16keyedit-0.4.ebuild b/x11-misc/e16keyedit/e16keyedit-0.4.ebuild
deleted file mode 100644
index 4e207242f3fe..000000000000
--- a/x11-misc/e16keyedit/e16keyedit-0.4.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/e16keyedit/e16keyedit-0.4.ebuild,v 1.5 2012/12/28 18:05:50 ulm Exp $
-
-DESCRIPTION="Key binding editor for enlightenment 16"
-HOMEPAGE="http://www.enlightenment.org/"
-SRC_URI="mirror://sourceforge/enlightenment/e16utils/${P}.tar.gz"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="=x11-libs/gtk+-2*"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_compile() {
-	econf --enable-gtk2 || die
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc README ChangeLog AUTHORS
-}
diff --git a/x11-misc/e16keyedit/e16keyedit-0.6.ebuild b/x11-misc/e16keyedit/e16keyedit-0.6.ebuild
deleted file mode 100644
index 479f904171ce..000000000000
--- a/x11-misc/e16keyedit/e16keyedit-0.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/e16keyedit/e16keyedit-0.6.ebuild,v 1.7 2012/12/28 18:05:50 ulm Exp $
-
-DESCRIPTION="Key binding editor for enlightenment 16"
-HOMEPAGE="http://www.enlightenment.org/"
-SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="=x11-libs/gtk+-2*"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_compile() {
-	econf --enable-gtk2 || die
-	emake || die
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc README ChangeLog AUTHORS
-}
diff --git a/x11-misc/grabc/Manifest b/x11-misc/grabc/Manifest
index ea40b56c952c..8c7531d36229 100644
--- a/x11-misc/grabc/Manifest
+++ b/x11-misc/grabc/Manifest
@@ -1 +1 @@
-DIST grabc1.1.tar.gz 2983 RMD160 405ef38ca88c30565b2d7acab81589294fd57515 SHA1 2260dfbcb16f77ac17e9c3b2ae4c8363c0fc86f8 SHA256 f0492a8ea33b46a16bdb94644420f54724e31c4436e4cd77937a30b2de3bb00e
+DIST grabc1.1.tar.gz 2983 SHA256 f0492a8ea33b46a16bdb94644420f54724e31c4436e4cd77937a30b2de3bb00e
diff --git a/x11-misc/grabc/grabc-1.1.ebuild b/x11-misc/grabc/grabc-1.1.ebuild
deleted file mode 100644
index 9169f19bac32..000000000000
--- a/x11-misc/grabc/grabc-1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/grabc/grabc-1.1.ebuild,v 1.11 2010/07/21 14:27:56 ssuominen Exp $
-
-S="${WORKDIR}/${PN}${PV}"
-DESCRIPTION="determine the color string in hex (or RGB components) by clicking on a pixel on the screen"
-HOMEPAGE="http://www.muquit.com/muquit/software/grabc/grabc.html"
-SRC_URI="http://www.muquit.com/muquit/software/${PN}/${PN}${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ppc64 amd64"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-proto/xproto
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	sed -i \
-		-e "s/-O/${CFLAGS}/" Makefile || \
-			die "sed Makefile failed"
-}
-
-src_install() {
-	dobin grabc  || die "dobin failed"
-	dodoc README || die "dodoc failed"
-}
diff --git a/x11-plugins/gkrellfire/Manifest b/x11-plugins/gkrellfire/Manifest
index ce719df12f9f..fd22e2dda34c 100644
--- a/x11-plugins/gkrellfire/Manifest
+++ b/x11-plugins/gkrellfire/Manifest
@@ -1,2 +1 @@
-DIST gkrellfire-0.3.3.tgz 11829 SHA256 0c22c48f2a0fab4fcb08f8ca072411ac84cae254907f8e180977a194e7397731 SHA512 3dae78d9251a4eb60b844a4d2dc60adabdd88a551d71fd92e12b891f1278ef90edf4f6b95bbc8ca85f75d1dadbd78f6d002063a54df90f8c558132429bb01823 WHIRLPOOL b986575920c0e0425a92e40574afb9845c0930f94f4238161eb607f94261a7b7182a95f8cd9fe52e286db9119a4d65d2dd9bf4065d31d5c482bcf28cb9a1deb1
 DIST gkrellfire-0.4.2.tgz 12474 SHA256 b8c81e038c4fad56be360af2a8423c096c98bb2bc382b024a1734fa36fddbb40 SHA512 1b7f6229567819092cd2eb2e33e3b7fd8340b0e913f6bcd1d11e9dd604730e3ca4fc1adaa8ae36895d80000f61931da14a586be6929c141c64b8519f8dc328bf WHIRLPOOL 1dffccc9de7af3684f031f9b963052783268a43b830f51779da46fab4e1e78f7d7a5e020f0980e0635eb660b7900a8204f217f674f12e509db3c3274c139c039
diff --git a/x11-plugins/gkrellfire/gkrellfire-0.3.3.ebuild b/x11-plugins/gkrellfire/gkrellfire-0.3.3.ebuild
deleted file mode 100644
index 97f0bf14a6d3..000000000000
--- a/x11-plugins/gkrellfire/gkrellfire-0.3.3.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/gkrellfire/gkrellfire-0.3.3.ebuild,v 1.6 2008/11/18 13:10:22 lack Exp $
-
-inherit gkrellm-plugin
-
-DESCRIPTION="Cpu load flames for GKrellM 2"
-HOMEPAGE="http://people.freenet.de/thomas-steinke"
-SRC_URI="http://people.freenet.de/thomas-steinke/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
diff --git a/x11-plugins/wmbiff/Manifest b/x11-plugins/wmbiff/Manifest
index 565c2271c11a..b4cadf8454dd 100644
--- a/x11-plugins/wmbiff/Manifest
+++ b/x11-plugins/wmbiff/Manifest
@@ -1,2 +1 @@
-DIST wmbiff-0.4.27.tar.gz 201713 SHA256 c25b7b3d3a5ddbbfa9f85bb39f553f5bc001189fc624e6761d986369068d7da3 SHA512 560de01866d61ce80a7fd4b045efb1ba6bd6362ea9d2d8364e2b73709ff2a04c2cd4f4808e1b6f042c9580e1cc55bb97fcee15762874b113162352d9b4fa2989 WHIRLPOOL 534b4b6ad46d41675292cb0a474ee527d2b263731ea1ffd726b27129031328eab8d74809e85467adb8fe9e092d093aa12291180a328119fab65aa27a1c0c3128
 DIST wmbiff-0.4.28.tar.gz 111398 SHA256 6e2acd3268dad93c596e4eae6ccf4407667f07226cf61dd7cfa312ae5e42dbc1 SHA512 a17fd4b4c3de09a907b7ffccc50f4560a7fddd5cb4dd01c72460806dc55259ba0b587d75f7505171a2a833f6735ddc4ded0a484d4227bfd552cc7343d79d7720 WHIRLPOOL c4a0c54f41a3ae33785364ea3bca808bc5b0c801a87ea33bd569f8fac9bb7632155af5d666bc7b3dbfe10fbebb8b2202fccb49266ded3fd299f2e0ac2749785c
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.27-r1.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.27-r1.ebuild
deleted file mode 100644
index 635c90b7618f..000000000000
--- a/x11-plugins/wmbiff/wmbiff-0.4.27-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmbiff/wmbiff-0.4.27-r1.ebuild,v 1.7 2014/08/12 00:08:20 blueness Exp $
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes"
-HOMEPAGE="http://sourceforge.net/projects/wmbiff/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=" amd64 ppc x86"
-IUSE="crypt"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm
-	crypt? (
-		>=dev-libs/libgcrypt-1.2.1:0
-		>=net-libs/gnutls-1.2.3
-		)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xproto"
-
-DOCS="ChangeLog FAQ NEWS README README.licq TODO wmbiff/sample.wmbiffrc"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gnutls.patch
-	epatch "${FILESDIR}"/${P}-gnutls-3.patch
-	epatch "${FILESDIR}"/${P}-invalid-strncpy.patch
-	sed -i -e '/AC_PATH_XTRA_CORRECTED/d' configure.ac || die
-	sed -i -e '/pkg.*SCRIPTS/s:pkglib:pkgdata:' scripts/Makefile.am || die #421411
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable crypt crypto)
-}
diff --git a/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild b/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild
deleted file mode 100644
index 347cc5e9b210..000000000000
--- a/x11-plugins/wmbiff/wmbiff-0.4.27.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/x11-plugins/wmbiff/wmbiff-0.4.27.ebuild,v 1.15 2014/08/10 20:04:34 slyfox Exp $
-
-EAPI=4
-inherit autotools eutils
-
-DESCRIPTION="WMBiff is a dock applet for WindowMaker which can monitor up to 5 mailboxes"
-HOMEPAGE="http://sourceforge.net/projects/wmbiff/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=" amd64 ppc x86"
-IUSE="crypt"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXpm
-	crypt? (
-		>=dev-libs/libgcrypt-1.2.1:0
-		<net-libs/gnutls-3.0
-		)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	x11-proto/xextproto
-	x11-proto/xproto"
-
-DOCS="ChangeLog FAQ NEWS README README.licq TODO wmbiff/sample.wmbiffrc"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gnutls.patch
-	sed -i -e '/AC_PATH_XTRA_CORRECTED/d' configure.ac || die
-	sed -i -e '/pkg.*SCRIPTS/s:pkglib:pkgdata:' scripts/Makefile.am || die #421411
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable crypt crypto)
-}
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index c380196ee008..3c171ef542de 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,3 +1,3 @@
 DIST mlterm-3.0.11.tar.gz 4328395 SHA256 808f15756aa40ada65a9b5760d9d1e4f281b62bb915ab51f4dd44e21a43f1e55 SHA512 e624ed4be1dce7b827e22981648d5574e9ae0543dbf2ca0bd9d7ab9fe17860c160e2bd7ad4a36044018daface70533518de7b9feba80e26605dc14d9e4d26d72 WHIRLPOOL 173721847d75878e445b928773298b53d93aebac88f727095406cb2e6e1460088cec1a83e53e2bc87d1f85c7656794aadf3def62f9f1e3919e676f7a9ecfa6f8
-DIST mlterm-3.4.3.tar.gz 3650696 SHA256 4710f6ea81e50cb1971c20153b41f14d6cd71d9533c1f524678163fb6a09ddef SHA512 0bfa3984b2933cfe4da83d5c2de52acacb734d67fad791f6ff6621ea90c79f6eaf7ff28f0877f633d65d8625bde5d16b5d0697c4648011576ece1e6c325be1f7 WHIRLPOOL 446c2694b36fde463ef37ea9ae31a35ebd4f249fb9ee304ecda466c0e95ffc292c4736efdc5d925819dd9c59b428013982ae95a81aa9798b152d093667f8784e
 DIST mlterm-3.4.5.tar.gz 3659801 SHA256 7df146099e1d578caddaeb7e93459f96ca1e2381fcc51157a25fe00336072752 SHA512 a85d092680dfe5498a90a4ad4935d441e41efa4ce3aa26f2e8897ef254f9c20d053bb045b5709626ee5bb4c9fdecda9f311a26db7fac6d6369d50336af7ab1f5 WHIRLPOOL 4533009727ad30b94b9b2814a17464975986df7eb2a42b383e654b1233651455a1ff938fae5273af350ccce29cbe08c7e68d26237a511ab7e3fcc45d05665b58
+DIST mlterm-3.5.0.tar.gz 3707639 SHA256 dedb211c52a8cdaa8891920da0a4f08f4b72f7b3514a5acb038b38419b24e4d3 SHA512 aaeac36a23d8544428b511760a5a23a843509fb75ceec59fea6f012d1626ca99f2772b9b18155d6b527482de649304b7e01ee8b7caef211bf5a01d71718d5ca8 WHIRLPOOL 347286ddcdc4aa97f6ebaa55ddcc0d8930f8396491b2d999d504cea2041d61b9eea090b70921b6f35c4f3eef26093403fcdde6538b1fcdb21299aae348b906ad
diff --git a/x11-terms/mlterm/mlterm-3.4.3.ebuild b/x11-terms/mlterm/mlterm-3.5.0.ebuild
similarity index 82%
rename from x11-terms/mlterm/mlterm-3.4.3.ebuild
rename to x11-terms/mlterm/mlterm-3.5.0.ebuild
index d6365dbdef6c..008100aa1f34 100644
--- a/x11-terms/mlterm/mlterm-3.4.3.ebuild
+++ b/x11-terms/mlterm/mlterm-3.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/x11-terms/mlterm/mlterm-3.4.3.ebuild,v 1.1 2015/02/17 12:39:06 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-3.5.0.ebuild,v 1.1 2015/06/27 12:40:29 hattya Exp $
 
 EAPI="5"
 
@@ -13,15 +13,17 @@ SRC_URI="mirror://sourceforge/mlterm/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="bidi cairo debug fcitx gtk ibus libssh2 m17n-lib nls regis scim static-libs uim utempter xft"
+IUSE="bidi cairo canna debug fcitx freewnn gtk ibus libssh2 m17n-lib nls regis scim static-libs uim utempter xft"
 
 RDEPEND="x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
 	bidi? ( dev-libs/fribidi )
 	cairo? ( x11-libs/cairo )
+	canna? ( app-i18n/canna )
 	fcitx? ( app-i18n/fcitx )
-	gtk? ( x11-libs/gtk+ )
+	freewnn? ( app-i18n/freewnn )
+	gtk? ( >=x11-libs/gtk+-2 )
 	ibus? ( app-i18n/ibus )
 	libssh2? ( net-libs/libssh2 )
 	m17n-lib? ( dev-libs/m17n-lib )
@@ -60,8 +62,10 @@ src_configure() {
 		--enable-optimize-redrawing
 		--enable-vt52
 		$(use_enable bidi fribidi)
+		$(use_enable canna)
 		$(use_enable debug)
 		$(use_enable fcitx)
+		$(use_enable freewnn wnn)
 		$(use_enable ibus)
 		$(use_enable libssh2 ssh2)
 		$(use_enable m17n-lib m17nlib)
@@ -77,6 +81,8 @@ src_configure() {
 		myeconfargs+=(--with-imagelib=gdk-pixbuf)
 		if has_version x11-libs/gtk+:3; then
 			myeconfargs+=(--with-gtk=3.0)
+		else
+			myeconfargs+=(--with-gtk=2.0)
 		fi
 		scrollbars+=",pixmap_engine"
 		tools+=",mlconfig,mlimgloader"
@@ -103,3 +109,7 @@ src_install () {
 	doicon contrib/icon/mlterm*
 	make_desktop_entry mlterm mlterm mlterm-icon "System;TerminalEmulator"
 }
+
+pkg_postinst() {
+	elog "The 'use_scrollbar' option was renamed to 'use_mdi'."
+}
diff --git a/x11-themes/greybird/greybird-1.5.3.ebuild b/x11-themes/greybird/greybird-1.5.3.ebuild
index d6a5476ac048..c9b8cdc3201f 100644
--- a/x11-themes/greybird/greybird-1.5.3.ebuild
+++ b/x11-themes/greybird/greybird-1.5.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/x11-themes/greybird/greybird-1.5.3.ebuild,v 1.1 2015/04/27 23:23:31 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/greybird/greybird-1.5.3.ebuild,v 1.3 2015/06/28 09:57:43 zlogene Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/shimmerproject/${MY_PN}/archive/v${PV}.tar.gz -> ${P
 # README says "dual-licensed as GPLv2 or later and CC-BY-SA 3.0 or later"
 LICENSE="CC-BY-SA-3.0 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="ayatana gnome"
 
 RDEPEND=">=x11-themes/gtk-engines-murrine-0.90"
diff --git a/x11-wm/fluxbox/fluxbox-1.3.7-r2.ebuild b/x11-wm/fluxbox/fluxbox-1.3.7-r2.ebuild
index 19b33ffc7576..2f0c49be2b36 100644
--- a/x11-wm/fluxbox/fluxbox-1.3.7-r2.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.7-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/x11-wm/fluxbox/fluxbox-1.3.7-r2.ebuild,v 1.3 2015/06/21 14:22:54 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.7-r2.ebuild,v 1.4 2015/06/28 11:28:26 zlogene Exp $
 
 EAPI=5
 inherit eutils flag-o-matic toolchain-funcs prefix
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.xz"
 HOMEPAGE="http://www.fluxbox.org"
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	!!<=x11-misc/fbdesk-1.2.1
diff --git a/x11-wm/mutter/Manifest b/x11-wm/mutter/Manifest
index c44770e0e25a..90ab246e5e73 100644
--- a/x11-wm/mutter/Manifest
+++ b/x11-wm/mutter/Manifest
@@ -1,3 +1,2 @@
-DIST mutter-3.14.3.tar.xz 1608232 SHA256 0b23a2d31980d9de8e92ef940e6f63e3ac0f6446e2afc69ecbc80163f6af3a23 SHA512 95e09a8361dfa3dca000f0a245d2c33eb135ee603f368cc4e6c63c3d28830a68658cc43eb114af285b7d2efbce256cbac8db2db7c84578f563dcdcf4032d246d WHIRLPOOL 7e06c9013a360d42dddc7ba844a375d4a5c5be441f265623c9c352a18b3f7d2e085a4698f4f61cc2527aa1a3a78c23d002603cd7eebe95f7afbe732adcdef0f5
 DIST mutter-3.14.4.tar.xz 1608836 SHA256 b4fbcc0664484d6215fc1f2101e9b636303de63544b786f2f87ebf2f6a616a8b SHA512 5b6e2d969e9a328e23bedb9fd0409da1af0d2ae8ded6a940992d4cff18a8cbfe2aa6582a56a2c8bd549a560a84d8cbffe953f151bcadf235315b8ec8bc7d1267 WHIRLPOOL 45c0329832999f14a5eaa77df3a6c7bbc72556b779fc55b3db9505594efec40252996bf8d96083da47fdb67b6bf5a9402f526d8bbb1e5436e5de16a8520e4acf
 DIST mutter-3.16.2.tar.xz 1549760 SHA256 4a2b752f0b3aa59f50563190222623324f5154acbb6bf174213f5849e77d0763 SHA512 f2cd350f8dbd03bc8e58f6c3f1b48cd51b38ae56e020d4e02100ef02f003d797a20095acf6a8874563fde42cfde49c4a28c418af151ee49f24ed391d5ae3caba WHIRLPOOL a88badf1f59c8c6ba8dcde4af207a2e66e66abbd6fd6c436289591bbb6eb3b017f50a7122282b69fd7d55127029e7623b7cbca3467d2d25d95c8ff6077dc371b
diff --git a/x11-wm/mutter/files/mutter-3.16.2-size-unredirected.patch b/x11-wm/mutter/files/mutter-3.16.2-size-unredirected.patch
new file mode 100644
index 000000000000..0999ebd582a0
--- /dev/null
+++ b/x11-wm/mutter/files/mutter-3.16.2-size-unredirected.patch
@@ -0,0 +1,151 @@
+From 351f444f9d16a90636feb217b15f0f376bf96d85 Mon Sep 17 00:00:00 2001
+From: "Jasper St. Pierre" <jstpierre@mecheye.net>
+Date: Tue, 23 Jun 2015 16:23:45 -0700
+Subject: surface-actor-x11: Make sure to set a size when unredirected
+
+When we're unredirected, we don't have a pixmap, and thus our allocation
+becomes 0x0. So when events come in, they pass right through our actor,
+going to the one underneath in the stack.
+
+Fix this by having a fallback size on the shaped texture actor when
+we're unredirected, causing it to always have a valid allocation.
+
+This fixes clicking on stuff in sloppy / mouse mode focus.
+
+diff --git a/src/compositor/meta-shaped-texture-private.h b/src/compositor/meta-shaped-texture-private.h
+index 4ee8027..21c6335 100644
+--- a/src/compositor/meta-shaped-texture-private.h
++++ b/src/compositor/meta-shaped-texture-private.h
+@@ -32,6 +32,9 @@
+ ClutterActor *meta_shaped_texture_new (void);
+ void meta_shaped_texture_set_texture (MetaShapedTexture *stex,
+                                       CoglTexture       *texture);
++void meta_shaped_texture_set_fallback_size (MetaShapedTexture *stex,
++                                            guint              fallback_width,
++                                            guint              fallback_height);
+ gboolean meta_shaped_texture_is_obscured (MetaShapedTexture *self);
+ 
+ #endif
+diff --git a/src/compositor/meta-shaped-texture.c b/src/compositor/meta-shaped-texture.c
+index 163c5e6..8701d1b 100644
+--- a/src/compositor/meta-shaped-texture.c
++++ b/src/compositor/meta-shaped-texture.c
+@@ -86,6 +86,7 @@ struct _MetaShapedTexturePrivate
+   cairo_region_t *unobscured_region;
+ 
+   guint tex_width, tex_height;
++  guint fallback_width, fallback_height;
+ 
+   guint create_mipmaps : 1;
+ };
+@@ -136,7 +137,20 @@ set_unobscured_region (MetaShapedTexture *self,
+   g_clear_pointer (&priv->unobscured_region, (GDestroyNotify) cairo_region_destroy);
+   if (unobscured_region)
+     {
+-      cairo_rectangle_int_t bounds = { 0, 0, priv->tex_width, priv->tex_height };
++      guint width, height;
++
++      if (priv->texture)
++        {
++          width = priv->tex_width;
++          height = priv->tex_height;
++        }
++      else
++        {
++          width = priv->fallback_width;
++          height = priv->fallback_height;
++        }
++
++      cairo_rectangle_int_t bounds = { 0, 0, width, height };
+       priv->unobscured_region = cairo_region_copy (unobscured_region);
+       cairo_region_intersect_rectangle (priv->unobscured_region, &bounds);
+     }
+@@ -499,16 +513,21 @@ meta_shaped_texture_get_preferred_width (ClutterActor *self,
+                                          gfloat       *natural_width_p)
+ {
+   MetaShapedTexturePrivate *priv;
++  guint width;
+ 
+   g_return_if_fail (META_IS_SHAPED_TEXTURE (self));
+ 
+   priv = META_SHAPED_TEXTURE (self)->priv;
+ 
+-  if (min_width_p)
+-    *min_width_p = priv->tex_width;
++  if (priv->texture)
++    width = priv->tex_width;
++  else
++    width = priv->fallback_width;
+ 
++  if (min_width_p)
++    *min_width_p = width;
+   if (natural_width_p)
+-    *natural_width_p = priv->tex_width;
++    *natural_width_p = width;
+ }
+ 
+ static void
+@@ -518,16 +537,21 @@ meta_shaped_texture_get_preferred_height (ClutterActor *self,
+                                           gfloat       *natural_height_p)
+ {
+   MetaShapedTexturePrivate *priv;
++  guint height;
+ 
+   g_return_if_fail (META_IS_SHAPED_TEXTURE (self));
+ 
+   priv = META_SHAPED_TEXTURE (self)->priv;
+ 
+-  if (min_height_p)
+-    *min_height_p = priv->tex_height;
++  if (priv->texture)
++    height = priv->tex_height;
++  else
++    height = priv->fallback_height;
+ 
++  if (min_height_p)
++    *min_height_p = height;
+   if (natural_height_p)
+-    *natural_height_p = priv->tex_height;
++    *natural_height_p = height;
+ }
+ 
+ static cairo_region_t *
+@@ -860,6 +884,17 @@ meta_shaped_texture_get_image (MetaShapedTexture     *stex,
+   return surface;
+ }
+ 
++void
++meta_shaped_texture_set_fallback_size (MetaShapedTexture *self,
++                                       guint              fallback_width,
++                                       guint              fallback_height)
++{
++  MetaShapedTexturePrivate *priv = self->priv;
++
++  priv->fallback_width = fallback_width;
++  priv->fallback_height = fallback_height;
++}
++
+ static void
+ meta_shaped_texture_cull_out (MetaCullable   *cullable,
+                               cairo_region_t *unobscured_region,
+diff --git a/src/compositor/meta-surface-actor-x11.c b/src/compositor/meta-surface-actor-x11.c
+index 4aa7ecd..b50b8f2 100644
+--- a/src/compositor/meta-surface-actor-x11.c
++++ b/src/compositor/meta-surface-actor-x11.c
+@@ -416,6 +416,7 @@ meta_surface_actor_x11_set_size (MetaSurfaceActorX11 *self,
+                                  int width, int height)
+ {
+   MetaSurfaceActorX11Private *priv = meta_surface_actor_x11_get_instance_private (self);
++  MetaShapedTexture *stex = meta_surface_actor_get_texture (META_SURFACE_ACTOR (self));
+ 
+   if (priv->last_width == width &&
+       priv->last_height == height)
+@@ -424,4 +425,5 @@ meta_surface_actor_x11_set_size (MetaSurfaceActorX11 *self,
+   priv->size_changed = TRUE;
+   priv->last_width = width;
+   priv->last_height = height;
++  meta_shaped_texture_set_fallback_size (stex, width, height);
+ }
+-- 
+cgit v0.10.2
+
diff --git a/x11-wm/mutter/mutter-3.14.3.ebuild b/x11-wm/mutter/mutter-3.16.2-r1.ebuild
similarity index 76%
rename from x11-wm/mutter/mutter-3.14.3.ebuild
rename to x11-wm/mutter/mutter-3.16.2-r1.ebuild
index 9b633f9fac2c..84dca03dcc70 100644
--- a/x11-wm/mutter/mutter-3.14.3.ebuild
+++ b/x11-wm/mutter/mutter-3.16.2-r1.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/x11-wm/mutter/mutter-3.14.3.ebuild,v 1.6 2015/03/15 13:34:58 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/mutter/mutter-3.16.2-r1.ebuild,v 1.1 2015/06/28 10:33:10 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
 
-inherit autotools eutils gnome2
+inherit eutils gnome2
 
 DESCRIPTION="GNOME 3 compositing window manager based on Clutter"
 HOMEPAGE="http://git.gnome.org/browse/mutter/"
@@ -13,7 +13,7 @@ HOMEPAGE="http://git.gnome.org/browse/mutter/"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="+introspection +kms test wayland"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 # libXi-1.7.4 or newer needed per:
 # https://bugzilla.gnome.org/show_bug.cgi?id=738944
@@ -21,13 +21,13 @@ COMMON_DEPEND="
 	>=x11-libs/pango-1.2[X,introspection?]
 	>=x11-libs/cairo-1.10[X]
 	>=x11-libs/gtk+-3.9.11:3[X,introspection?]
-	>=dev-libs/glib-2.36.0:2
-	>=media-libs/clutter-1.19.5:1.0[introspection?]
+	>=dev-libs/glib-2.36.0:2[dbus]
+	>=media-libs/clutter-1.21.3:1.0[introspection?]
 	>=media-libs/cogl-1.17.1:1.0=[introspection?]
 	>=media-libs/libcanberra-0.26[gtk3]
 	>=x11-libs/startup-notification-0.7
 	>=x11-libs/libXcomposite-0.2
-	>=gnome-base/gsettings-desktop-schemas-3.7.3[introspection?]
+	>=gnome-base/gsettings-desktop-schemas-3.15.92[introspection?]
 	gnome-base/gnome-desktop:3=
 	>sys-power/upower-0.99:=
 
@@ -50,7 +50,7 @@ COMMON_DEPEND="
 
 	gnome-extra/zenity
 
-	introspection? ( >=dev-libs/gobject-introspection-1.42 )
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 	kms? (
 		dev-libs/libinput
 		>=media-libs/clutter-1.20[egl]
@@ -79,13 +79,8 @@ RDEPEND="${COMMON_DEPEND}
 "
 
 src_prepare() {
-	# Compat with Ubuntu metacity themes (e.g. x11-themes/light-themes)
-	epatch "${FILESDIR}"/${PN}-3.2.1-ignore-shadow-and-padding.patch
-
-	# Automagic fixes
-	epatch "${FILESDIR}"/${PN}-3.14.2-automagic.patch
-
-	eautoreconf
+	# surface-actor-x11: Make sure to set a size when unredirected (from 3.16 branch)
+	epatch "${FILESDIR}"/${P}-size-unredirected.patch
 	gnome2_src_prepare
 }